aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/inline.rs
diff options
context:
space:
mode:
authorManish Goregaokar <manishearth@gmail.com>2017-07-17 11:41:52 -0700
committerManish Goregaokar <manishsmail@gmail.com>2017-07-17 18:02:25 -0700
commit808b1f509b7e1524cfc49f7cc1fc89fd5f8e5737 (patch)
treeb6f4e04c1d0a4e427b2360d60abb02eea8e5aec8 /components/layout/inline.rs
parent04b0ae64f2fe606744142e353388749fe283a8ad (diff)
downloadservo-808b1f509b7e1524cfc49f7cc1fc89fd5f8e5737.tar.gz
servo-808b1f509b7e1524cfc49f7cc1fc89fd5f8e5737.zip
stylo: Use ComputedValuesInner instead of ComputedValues when we don't need it
Diffstat (limited to 'components/layout/inline.rs')
-rw-r--r--components/layout/inline.rs12
1 files changed, 6 insertions, 6 deletions
diff --git a/components/layout/inline.rs b/components/layout/inline.rs
index de58b05255b..9228c21a7ba 100644
--- a/components/layout/inline.rs
+++ b/components/layout/inline.rs
@@ -33,7 +33,7 @@ use std::sync::Arc;
use style::computed_values::{display, overflow_x, position, text_align, text_justify};
use style::computed_values::{vertical_align, white_space};
use style::logical_geometry::{LogicalRect, LogicalSize, WritingMode};
-use style::properties::{longhands, ServoComputedValues};
+use style::properties::{longhands, ComputedValues};
use style::servo::restyle_damage::{BUBBLE_ISIZES, REFLOW, REFLOW_OUT_OF_FLOW, REPOSITION, RESOLVE_GENERATED_CONTENT};
use text;
use unicode_bidi as bidi;
@@ -1106,7 +1106,7 @@ impl InlineFlow {
/// Computes the minimum metrics for each line. This is done during flow construction.
///
/// `style` is the style of the block.
- pub fn minimum_line_metrics(&self, font_context: &mut FontContext, style: &ServoComputedValues)
+ pub fn minimum_line_metrics(&self, font_context: &mut FontContext, style: &ComputedValues)
-> LineMetrics {
InlineFlow::minimum_line_metrics_for_fragments(&self.fragments.fragments,
font_context,
@@ -1119,7 +1119,7 @@ impl InlineFlow {
/// `style` is the style of the block that these fragments belong to.
pub fn minimum_line_metrics_for_fragments(fragments: &[Fragment],
font_context: &mut FontContext,
- style: &ServoComputedValues)
+ style: &ComputedValues)
-> LineMetrics {
// 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.
@@ -1665,7 +1665,7 @@ impl Flow for InlineFlow {
self.build_display_list_for_inline(state);
}
- fn repair_style(&mut self, _: &StyleArc<ServoComputedValues>) {}
+ fn repair_style(&mut self, _: &StyleArc<ComputedValues>) {}
fn compute_overflow(&self) -> Overflow {
let mut overflow = Overflow::new();
@@ -1754,8 +1754,8 @@ impl fmt::Debug for InlineFlow {
#[derive(Clone)]
pub struct InlineFragmentNodeInfo {
pub address: OpaqueNode,
- pub style: StyleArc<ServoComputedValues>,
- pub selected_style: StyleArc<ServoComputedValues>,
+ pub style: StyleArc<ComputedValues>,
+ pub selected_style: StyleArc<ComputedValues>,
pub pseudo: PseudoElementType<()>,
pub flags: InlineFragmentNodeFlags,
}