Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

style: Have Parse derive respect #[css(skip)] on variant as well and derive Parse for KeywordSize.

Browse source 
Bug: 1434130
Reviewed-by: emilio
MozReview-Commit-ID: evSvk1RQGe
This commit is contained in:
Xidorn Quan 2018-04-29 09:03:31 +10:00 • committed by Emilio Cobos Álvarez
parent 185e4ce61d
commit 43bb6364f6
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
3 changed files with 7 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/style/values/generics/font.rs
View file

@ -186,8 +186,9 @@ impl<Length> SpecifiedValueInfo for KeywordInfo<Length> {
}
/// CSS font keywords
#[derive(Animate, Clone, ComputeSquaredDistance, Copy, Debug, MallocSizeOf, PartialEq,
SpecifiedValueInfo, ToAnimatedValue, ToAnimatedZero, ToCss)]
#[derive(Animate, Clone, ComputeSquaredDistance, Copy, Debug, MallocSizeOf,
Parse, PartialEq, SpecifiedValueInfo, ToAnimatedValue, ToAnimatedZero,
ToCss)]
#[allow(missing_docs)]
pub enum KeywordSize {
#[css(keyword = "xx-small")]

15
components/style/values/specified/font.rs
View file

@ -715,21 +715,6 @@ impl KeywordInfo {
}
}
impl KeywordSize {
/// Parses a keyword size.
pub fn parse<'i, 't>(input: &mut Parser<'i, 't>) -> Result<Self, ParseError<'i>> {
try_match_ident_ignore_ascii_case! { input,
"xx-small" => Ok(KeywordSize::XXSmall),
"x-small" => Ok(KeywordSize::XSmall),
"small" => Ok(KeywordSize::Small),
"medium" => Ok(KeywordSize::Medium),
"large" => Ok(KeywordSize::Large),
"x-large" => Ok(KeywordSize::XLarge),
"xx-large" => Ok(KeywordSize::XXLarge),
}
}
}
/// This is the ratio applied for font-size: larger
/// and smaller by both Firefox and Chrome
const LARGER_FONT_SIZE_RATIO: f32 = 1.2;

4
components/style_derive/parse.rs
View file

@ -20,6 +20,10 @@ pub fn derive(input: DeriveInput) -> Tokens {
);
let variant_attrs = cg::parse_variant_attrs_from_ast::<CssVariantAttrs>(&variant.ast());
if variant_attrs.skip {
return match_body;
}
let identifier = cg::to_css_identifier(
&variant_attrs.keyword.unwrap_or(variant.ast().ident.as_ref().into()),
);