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

Custom properties: handle premature EOF correctly.

Browse source
This commit is contained in:
Simon Sapin 2015-10-12 16:49:55 +02:00
parent 69d398f29a
commit 020d03b656
2 changed files with 149 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

13
components/style/properties.mako.rs
View file

@ -211,10 +211,10 @@ pub mod longhands {
let var = input.seen_var_functions();
if specified.is_err() && var {
input.reset(start);
let (first_token_type, _) = try!(
::custom_properties::parse_declaration_value(input, &mut None));
let (first_token_type, css) = try!(
::custom_properties::parse_non_custom_with_var(input));
return Ok(DeclaredValue::WithVariables {
css: input.slice_from(start).to_owned(),
css: css.into_owned(),
first_token_type: first_token_type,
base_url: context.base_url.clone(),
from_shorthand: Shorthand::None,
@ -4914,13 +4914,12 @@ pub mod shorthands {
Ok(())
} else if var {
input.reset(start);
let (first_token_type, _) = try!(
::custom_properties::parse_declaration_value(input, &mut None));
let css = input.slice_from(start);
let (first_token_type, css) = try!(
::custom_properties::parse_non_custom_with_var(input));
% for sub_property in shorthand.sub_properties:
declarations.push(PropertyDeclaration::${sub_property.camel_case}(
DeclaredValue::WithVariables {
css: css.to_owned(),
css: css.clone().into_owned(),
first_token_type: first_token_type,
base_url: context.base_url.clone(),
from_shorthand: Shorthand::${shorthand.camel_case},