diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-29 18:25:40 +0530 |
---|---|---|
committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-03-29 18:25:40 +0530 |
commit | 639fdd6b128e0cfd418e4ae0dd78de3f5aecac4c (patch) | |
tree | a54fbc3cfbc6caa31f721038f45bac6d535e6b59 /components/layout/construct.rs | |
parent | c4e112a3be6930e6373483f6e42279d0682b3a48 (diff) | |
parent | c2ad0847138f1dcc3e51123bfbd7734384568697 (diff) | |
download | servo-639fdd6b128e0cfd418e4ae0dd78de3f5aecac4c.tar.gz servo-639fdd6b128e0cfd418e4ae0dd78de3f5aecac4c.zip |
Auto merge of #10210 - perlun:rename-computedvalues-to-servocomputedvalues, r=SimonSapin
ComputedValues is now ServoComputedValues
This is the first part of #10185. More to follow. I have built this locally with both servo and geckolib without errors; let's see if it succeeds on all platforms as well.
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/10210)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/construct.rs')
-rw-r--r-- | components/layout/construct.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/layout/construct.rs b/components/layout/construct.rs index c964501116c..050eb9d9857 100644 --- a/components/layout/construct.rs +++ b/components/layout/construct.rs @@ -45,7 +45,7 @@ use std::sync::atomic::Ordering; use style::computed_values::content::ContentItem; use style::computed_values::{caption_side, display, empty_cells, float, list_style_position}; use style::computed_values::{position}; -use style::properties::{self, ComputedValues, TComputedValues}; +use style::properties::{self, ServoComputedValues, TComputedValues}; use table::TableFlow; use table_caption::TableCaptionFlow; use table_cell::TableCellFlow; @@ -105,7 +105,7 @@ pub enum ConstructionItem { /// Inline fragments and associated {ib} splits that have not yet found flows. InlineFragments(InlineFragmentsConstructionResult), /// Potentially ignorable whitespace. - Whitespace(OpaqueNode, PseudoElementType<()>, Arc<ComputedValues>, RestyleDamage), + Whitespace(OpaqueNode, PseudoElementType<()>, Arc<ServoComputedValues>, RestyleDamage), /// TableColumn Fragment TableColumnFragment(Fragment), } @@ -702,7 +702,7 @@ impl<'a, ConcreteThreadSafeLayoutNode: ThreadSafeLayoutNode> fn create_fragments_for_node_text_content(&self, fragments: &mut IntermediateInlineFragments, node: &ConcreteThreadSafeLayoutNode, - style: &Arc<ComputedValues>) { + style: &Arc<ServoComputedValues>) { // Fast path: If there is no text content, return immediately. let text_content = node.text_content(); if text_content.is_empty() { @@ -1821,7 +1821,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: &Arc<ComputedValues>) -> Option<(&'static str, &'static str)> { +fn bidi_control_chars(style: &Arc<ServoComputedValues>) -> Option<(&'static str, &'static str)> { use style::computed_values::direction::T::*; use style::computed_values::unicode_bidi::T::*; |