author | Emilio Cobos Álvarez <emilio@crisal.io> |
Sun, 29 Apr 2018 02:26:14 +0200 | |
changeset 416189 | b5e72af686a26cae2d311217a28083b26cfb187d |
parent 416188 | fb87372128d5fcd92e5ddc0e7d55211c0f4035d7 |
child 416190 | 05350bbe9f8a75948567ef234d2cb151371b923e |
push id | 33918 |
push user | nerli@mozilla.com |
push date | Sun, 29 Apr 2018 09:47:13 +0000 |
treeherder | mozilla-central@afbec7f03bd8 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | me |
milestone | 61.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/servo/components/style/values/specified/font.rs +++ b/servo/components/style/values/specified/font.rs @@ -19,17 +19,17 @@ use style_traits::{CssWriter, KeywordsCo use style_traits::{SpecifiedValueInfo, StyleParseErrorKind, ToCss}; use style_traits::values::SequenceWriter; use values::CustomIdent; use values::computed::{Angle as ComputedAngle, Percentage as ComputedPercentage}; use values::computed::{font as computed, Context, Length, NonNegativeLength, ToComputedValue}; use values::computed::font::{FamilyName, FontFamilyList, FontStyleAngle, SingleFontFamily}; use values::generics::NonNegative; use values::generics::font::{self as generics, FeatureTagValue, FontSettings, FontTag}; -use values::generics::font::{KeywordInfo as GenericKeywordInfo, KeywordSize, VariationValue}; +use values::generics::font::{KeywordSize, VariationValue}; use values::specified::{AllowQuirks, Angle, Integer, LengthOrPercentage, NoCalcLength, Number, Percentage}; use values::specified::length::{FontBaseSize, AU_PER_PT, AU_PER_PX}; // FIXME(emilio): The system font code is copy-pasta, and should be cleaned up. macro_rules! system_font_methods { ($ty:ident, $field:ident) => { system_font_methods!($ty); @@ -692,17 +692,17 @@ impl Parse for FontSizeAdjust { Ok(FontSizeAdjust::Number(Number::parse_non_negative( context, input, )?)) } } /// Additional information for specified keyword-derived font sizes. -pub type KeywordInfo = GenericKeywordInfo<NonNegativeLength>; +pub type KeywordInfo = generics::KeywordInfo<NonNegativeLength>; impl KeywordInfo { /// Computes the final size for this font-size keyword, accounting for /// text-zoom. pub fn to_computed_value(&self, context: &Context) -> NonNegativeLength { let base = context.maybe_zoom_text(self.kw.to_computed_value(context)); base.scale_by(self.factor) + context.maybe_zoom_text(self.offset) }