Renamed style structs.

The idea is to rename all style structs from Foo to ServoFoo, as described out in #10185.
This commit is contained in:
Per Lundberg 2016-03-31 23:47:40 +03:00
parent a026e86267
commit 96835c6d6f
7 changed files with 110 additions and 100 deletions

View file

@ -24,7 +24,7 @@ use std::sync::Arc;
use style::computed_values::{line_height, text_orientation, text_rendering, text_transform};
use style::computed_values::{white_space};
use style::logical_geometry::{LogicalSize, WritingMode};
use style::properties::style_structs::Font as FontStyle;
use style::properties::style_structs::ServoFont;
use style::properties::{ComputedValues, ServoComputedValues};
use unicode_bidi::{is_rtl, process_text};
use unicode_script::{get_script, Script};
@ -409,11 +409,11 @@ fn bounding_box_for_run_metrics(metrics: &RunMetrics, writing_mode: WritingMode)
}
/// Returns the metrics of the font represented by the given `FontStyle`, respectively.
/// Returns the metrics of the font represented by the given `ServoFont`, 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<FontStyle>)
pub fn font_metrics_for_style(font_context: &mut FontContext, font_style: Arc<ServoFont>)
-> FontMetrics {
let fontgroup = font_context.layout_font_group_for_style(font_style);
// FIXME(https://github.com/rust-lang/rust/issues/23338)