Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Don't force ComputedValues to derive Debug.

Browse source 
The code that uses it is of dubious utility, fwiw, but some of it is used on
Servo, so I'll kill that separately.

Bug: 1412486
Reviewed-by: xidorn
MozReview-Commit-ID: KauvXX32zLM
This commit is contained in:
Emilio Cobos Álvarez 2017-10-30 12:00:00 +01:00
parent b74f52d6df
commit 480d2267e6
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
2 changed files with 3 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

21
components/style/dom.rs
View file

@ -243,24 +243,6 @@ pub trait TNode : Sized + Copy + Clone + Debug + NodeInfo + PartialEq {
unsafe fn set_can_be_fragmented(&self, value: bool); unsafe fn set_can_be_fragmented(&self, value: bool);
} }
/// Wrapper to output the ElementData along with the node when formatting for
/// Debug.
pub struct ShowData<N: TNode>(pub N);
impl<N: TNode> Debug for ShowData<N> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fmt_with_data(f, self.0)
}
}
/// Wrapper to output the primary computed values along with the node when
/// formatting for Debug. This is very verbose.
pub struct ShowDataAndPrimaryValues<N: TNode>(pub N);
impl<N: TNode> Debug for ShowDataAndPrimaryValues<N> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
fmt_with_data_and_primary_values(f, self.0)
}
}
/// Wrapper to output the subtree rather than the single node when formatting /// Wrapper to output the subtree rather than the single node when formatting
/// for Debug. /// for Debug.
pub struct ShowSubtree<N: TNode>(pub N); pub struct ShowSubtree<N: TNode>(pub N);
@ -283,7 +265,9 @@ impl<N: TNode> Debug for ShowSubtreeData<N> {
/// Wrapper to output the subtree along with the ElementData and primary /// Wrapper to output the subtree along with the ElementData and primary
/// ComputedValues when formatting for Debug. This is extremely verbose. /// ComputedValues when formatting for Debug. This is extremely verbose.
#[cfg(feature = "servo")]
pub struct ShowSubtreeDataAndPrimaryValues<N: TNode>(pub N); pub struct ShowSubtreeDataAndPrimaryValues<N: TNode>(pub N);
#[cfg(feature = "servo")]
impl<N: TNode> Debug for ShowSubtreeDataAndPrimaryValues<N> { impl<N: TNode> Debug for ShowSubtreeDataAndPrimaryValues<N> {
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
writeln!(f, "DOM Subtree:")?; writeln!(f, "DOM Subtree:")?;
@ -305,6 +289,7 @@ fn fmt_with_data<N: TNode>(f: &mut fmt::Formatter, n: N) -> fmt::Result {
} }
} }
#[cfg(feature = "servo")]
fn fmt_with_data_and_primary_values<N: TNode>(f: &mut fmt::Formatter, n: N) -> fmt::Result { fn fmt_with_data_and_primary_values<N: TNode>(f: &mut fmt::Formatter, n: N) -> fmt::Result {
if let Some(el) = n.as_element() { if let Some(el) = n.as_element() {
let dd = el.has_dirty_descendants(); let dd = el.has_dirty_descendants();

1
components/style/properties/gecko.mako.rs
View file

@ -71,7 +71,6 @@ pub mod style_structs {
/// FIXME(emilio): This is completely duplicated with the other properties code. /// FIXME(emilio): This is completely duplicated with the other properties code.
pub type ComputedValuesInner = ::gecko_bindings::structs::ServoComputedData; pub type ComputedValuesInner = ::gecko_bindings::structs::ServoComputedData;
#[derive(Debug)]
#[repr(C)] #[repr(C)]
pub struct ComputedValues(::gecko_bindings::structs::mozilla::ServoStyleContext); pub struct ComputedValues(::gecko_bindings::structs::mozilla::ServoStyleContext);