diff options
| author | Simon Sapin <simon.sapin@exyr.org> | 2016-07-19 20:29:22 +0200 |
|---|---|---|
| committer | Simon Sapin <simon.sapin@exyr.org> | 2016-07-20 08:42:40 +0200 |
| commit | 789807b7b09e0742a197c98efd2f81b85b751a57 (patch) | |
| tree | e093027760cf23719d9f6b3e279eab46e9b3168f /components/layout/text.rs | |
| parent | b2a7e4437391abd92486d5bef879fadadabab162 (diff) | |
| download | servo-789807b7b09e0742a197c98efd2f81b85b751a57.tar.gz servo-789807b7b09e0742a197c98efd2f81b85b751a57.zip | |
Remove the ComputedValue traits and style_struct_traits
Diffstat (limited to 'components/layout/text.rs')
| -rw-r--r-- | components/layout/text.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/layout/text.rs b/components/layout/text.rs index 2b60fb1ee74..85e0f620290 100644 --- a/components/layout/text.rs +++ b/components/layout/text.rs @@ -25,8 +25,8 @@ use std::sync::Arc; use style::computed_values::white_space; use style::computed_values::{line_height, text_orientation, text_rendering, text_transform}; use style::logical_geometry::{LogicalSize, WritingMode}; -use style::properties::style_structs::ServoFont; -use style::properties::{ComputedValues, ServoComputedValues}; +use style::properties::ServoComputedValues; +use style::properties::style_structs; use unicode_bidi::{is_rtl, process_text}; use unicode_script::{get_script, Script}; @@ -431,11 +431,11 @@ fn bounding_box_for_run_metrics(metrics: &RunMetrics, writing_mode: WritingMode) } -/// Returns the metrics of the font represented by the given `ServoFont`, respectively. +/// Returns the metrics of the font represented by the given `style_structs::Font`, respectively. /// /// `#[inline]` because often the caller only needs a few fields from the font metrics. #[inline] -pub fn font_metrics_for_style(font_context: &mut FontContext, font_style: Arc<ServoFont>) +pub fn font_metrics_for_style(font_context: &mut FontContext, font_style: Arc<style_structs::Font>) -> FontMetrics { let fontgroup = font_context.layout_font_group_for_style(font_style); // FIXME(https://github.com/rust-lang/rust/issues/23338) |