diff options
author | Manish Goregaokar <manishearth@gmail.com> | 2017-07-17 11:41:52 -0700 |
---|---|---|
committer | Manish Goregaokar <manishsmail@gmail.com> | 2017-07-17 18:02:25 -0700 |
commit | 808b1f509b7e1524cfc49f7cc1fc89fd5f8e5737 (patch) | |
tree | b6f4e04c1d0a4e427b2360d60abb02eea8e5aec8 /components/layout/construct.rs | |
parent | 04b0ae64f2fe606744142e353388749fe283a8ad (diff) | |
download | servo-808b1f509b7e1524cfc49f7cc1fc89fd5f8e5737.tar.gz servo-808b1f509b7e1524cfc49f7cc1fc89fd5f8e5737.zip |
stylo: Use ComputedValuesInner instead of ComputedValues when we don't need it
Diffstat (limited to 'components/layout/construct.rs')
-rw-r--r-- | components/layout/construct.rs | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/components/layout/construct.rs b/components/layout/construct.rs index cbb4400544e..cfb92ebc78a 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -52,7 +52,7 @@ use style::computed_values::content::ContentItem; use style::computed_values::position; use style::context::SharedStyleContext; use style::logical_geometry::Direction; -use style::properties::ServoComputedValues; +use style::properties::ComputedValues; use style::properties::longhands::list_style_image; use style::selector_parser::{PseudoElement, RestyleDamage}; use style::servo::restyle_damage::{BUBBLE_ISIZES, RECONSTRUCT_FLOW}; @@ -109,7 +109,7 @@ pub enum ConstructionItem { /// Inline fragments and associated {ib} splits that have not yet found flows. InlineFragments(InlineFragmentsConstructionResult), /// Potentially ignorable whitespace. - Whitespace(OpaqueNode, PseudoElementType<()>, StyleArc<ServoComputedValues>, RestyleDamage), + Whitespace(OpaqueNode, PseudoElementType<()>, StyleArc<ComputedValues>, RestyleDamage), /// TableColumn Fragment TableColumnFragment(Fragment), } @@ -677,7 +677,7 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode> fn create_fragments_for_node_text_content(&self, fragments: &mut IntermediateInlineFragments, node: &ConcreteThreadSafeLayoutNode, - style: &StyleArc<ServoComputedValues>) { + style: &StyleArc<ComputedValues>) { // Fast path: If there is no text content, return immediately. let text_content = node.text_content(); if text_content.is_empty() { @@ -1806,7 +1806,7 @@ pub fn strip_ignorable_whitespace_from_end(this: &mut LinkedList<Fragment>) { /// If the 'unicode-bidi' property has a value other than 'normal', return the bidi control codes /// to inject before and after the text content of the element. -fn bidi_control_chars(style: &StyleArc<ServoComputedValues>) -> Option<(&'static str, &'static str)> { +fn bidi_control_chars(style: &StyleArc<ComputedValues>) -> Option<(&'static str, &'static str)> { use style::computed_values::direction::T::*; use style::computed_values::unicode_bidi::T::*; @@ -1851,7 +1851,7 @@ trait ComputedValueUtils { fn has_padding_or_border(&self) -> bool; } -impl ComputedValueUtils for ServoComputedValues { +impl ComputedValueUtils for ComputedValues { fn has_padding_or_border(&self) -> bool { let padding = self.get_padding(); let border = self.get_border(); |