Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-11 16:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Use a generic type in preparation to fix animation.

Browse source 
Apart from a bit more code reuse.

Bug: 1455358
Reviewed-by: xidorn
MozReview-Commit-ID: 2BNOK6v30lX
This commit is contained in:
Emilio Cobos Álvarez 2018-04-19 21:23:31 +02:00
parent 32d4da8a99
commit 737501153b
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
9 changed files with 158 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

10
components/style/font_face.rs
View file

@ -25,7 +25,8 @@ use values::computed::font::FamilyName;
#[cfg(feature = "gecko")]
use values::specified::font::{SpecifiedFontFeatureSettings, SpecifiedFontVariationSettings};
use values::specified::font::{AbsoluteFontWeight, FontStretch as SpecifiedFontStretch};
use values::specified::font::FontStyle as SpecifiedFontStyle;
use values::specified::font::SpecifiedFontStyle;
use values::generics::font::FontStyle as GenericFontStyle;
use values::specified::Angle;
use values::specified::url::SpecifiedUrl;
@ -145,16 +146,15 @@ impl Parse for FontStyle {
) -> Result<Self, ParseError<'i>> {
let style = SpecifiedFontStyle::parse(context, input)?;
Ok(match style {
SpecifiedFontStyle::Normal => FontStyle::Normal,
SpecifiedFontStyle::Italic => FontStyle::Italic,
SpecifiedFontStyle::Oblique(angle) => {
GenericFontStyle::Normal => FontStyle::Normal,
GenericFontStyle::Italic => FontStyle::Italic,
GenericFontStyle::Oblique(angle) => {
let second_angle = input.try(|input| {
SpecifiedFontStyle::parse_angle(context, input)
}).unwrap_or_else(|_| angle.clone());
FontStyle::Oblique(angle, second_angle)
}
SpecifiedFontStyle::System(..) => unreachable!(),
})
}
}