Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Remove ComputedValueUtils

Browse source
This commit is contained in:
Anthony Ramine 2019-01-14 12:08:34 +01:00
parent b9b70445cb
commit 059c9f4f78
1 changed files with 13 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

33
components/layout/construct.rs
View file

@ -1015,7 +1015,7 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode>
} }
let node_style = node.style(self.style_context()); let node_style = node.style(self.style_context());
if is_empty && node_style.has_padding_or_border() { if is_empty && has_padding_or_border(&node_style) {
// An empty inline box needs at least one fragment to draw its background and borders. // An empty inline box needs at least one fragment to draw its background and borders.
let info = SpecificFragmentInfo::UnscannedText(Box::new( let info = SpecificFragmentInfo::UnscannedText(Box::new(
UnscannedTextFragmentInfo::new(Box::<str>::from(""), None), UnscannedTextFragmentInfo::new(Box::<str>::from(""), None),
@ -2191,26 +2191,19 @@ where
) )
} }
/// Convenience methods for computed CSS values /// Returns true if this node has non-zero padding or border.
trait ComputedValueUtils { fn has_padding_or_border(values: &ComputedValues) -> bool {
/// Returns true if this node has non-zero padding or border. let padding = values.get_padding();
fn has_padding_or_border(&self) -> bool; let border = values.get_border();
}
impl ComputedValueUtils for ComputedValues { !padding.padding_top.is_definitely_zero() ||
fn has_padding_or_border(&self) -> bool { !padding.padding_right.is_definitely_zero() ||
let padding = self.get_padding(); !padding.padding_bottom.is_definitely_zero() ||
let border = self.get_border(); !padding.padding_left.is_definitely_zero() ||
border.border_top_width.px() != 0. ||
!padding.padding_top.is_definitely_zero() || border.border_right_width.px() != 0. ||
!padding.padding_right.is_definitely_zero() || border.border_bottom_width.px() != 0. ||
!padding.padding_bottom.is_definitely_zero() || border.border_left_width.px() != 0.
!padding.padding_left.is_definitely_zero() ||
border.border_top_width.px() != 0. ||
border.border_right_width.px() != 0. ||
border.border_bottom_width.px() != 0. ||
border.border_left_width.px() != 0.
}
} }
/// Maintains a stack of anonymous boxes needed to ensure that the flow tree is *legal*. The tree /// Maintains a stack of anonymous boxes needed to ensure that the flow tree is *legal*. The tree