diff options
author | Per Lundberg <perlun@gmail.com> | 2016-03-26 23:07:44 +0200 |
---|---|---|
committer | Per Lundberg <perlun@gmail.com> | 2016-03-27 10:55:43 +0300 |
commit | c2ad0847138f1dcc3e51123bfbd7734384568697 (patch) | |
tree | e27a12810aaf2ef705f805ea67d51b8d430b35c5 /components/layout/inline.rs | |
parent | bed91b3334786970c91a47c3bc95889d8675b4d5 (diff) | |
download | servo-c2ad0847138f1dcc3e51123bfbd7734384568697.tar.gz servo-c2ad0847138f1dcc3e51123bfbd7734384568697.zip |
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.
Diffstat (limited to 'components/layout/inline.rs')
-rw-r--r-- | components/layout/inline.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/layout/inline.rs b/components/layout/inline.rs index cd2a822f317..dfaadf4defc 100644 --- a/components/layout/inline.rs +++ b/components/layout/inline.rs @@ -30,7 +30,7 @@ use std::{fmt, isize, mem}; use style::computed_values::{display, overflow_x, position, text_align, text_justify}; use style::computed_values::{text_overflow, vertical_align, white_space}; use style::logical_geometry::{LogicalRect, LogicalSize, WritingMode}; -use style::properties::{ComputedValues, TComputedValues}; +use style::properties::{ServoComputedValues, TComputedValues}; use style::values::computed::LengthOrPercentage; use text; use unicode_bidi; @@ -1176,7 +1176,7 @@ impl InlineFlow { /// `style` is the style of the block. pub fn compute_minimum_ascent_and_descent(&self, font_context: &mut FontContext, - style: &ComputedValues) + style: &ServoComputedValues) -> (Au, Au) { // As a special case, if this flow contains only hypothetical fragments, then the entire // flow is hypothetical and takes up no space. See CSS 2.1 § 10.3.7. @@ -1761,7 +1761,7 @@ impl Flow for InlineFlow { } } - fn repair_style(&mut self, _: &Arc<ComputedValues>) {} + fn repair_style(&mut self, _: &Arc<ServoComputedValues>) {} fn compute_overflow(&self) -> Overflow { let mut overflow = Overflow::new(); @@ -1850,7 +1850,7 @@ impl fmt::Debug for InlineFlow { #[derive(Clone)] pub struct InlineFragmentNodeInfo { pub address: OpaqueNode, - pub style: Arc<ComputedValues>, + pub style: Arc<ServoComputedValues>, pub pseudo: PseudoElementType<()>, pub flags: InlineFragmentNodeFlags, } |