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

var() functions in longhands: use a single code path with IDs

Browse source 
… rather than generating similar code for every longhand property
This commit is contained in:
Simon Sapin 2017-07-12 23:10:57 +02:00
parent 252e52e24e
commit 54f1325a49
2 changed files with 39 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

21
components/style/properties/helpers.mako.rs
View file

@ -452,26 +452,7 @@
}
pub fn parse_declared<'i, 't>(context: &ParserContext, input: &mut Parser<'i, 't>)
-> Result<PropertyDeclaration, ParseError<'i>> {
input.look_for_var_functions();
let start = input.position();
let specified = parse_specified(context, input);
if specified.is_err() {
while let Ok(_) = input.next() {} // Look for var() after the error.
}
let var = input.seen_var_functions();
if specified.is_err() && var {
input.reset(start);
let (first_token_type, css) =
::custom_properties::parse_non_custom_with_var(input)?;
return Ok(PropertyDeclaration::WithVariables(LonghandId::${property.camel_case},
Arc::new(UnparsedValue {
css: css.into_owned(),
first_token_type: first_token_type,
url_data: context.url_data.clone(),
from_shorthand: None,
})))
}
specified.map(|s| PropertyDeclaration::${property.camel_case}(s))
parse_specified(context, input).map(PropertyDeclaration::${property.camel_case})
}
% endif
}