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

Only allow color value at the last element.

Browse source
This commit is contained in:
Xidorn Quan 2017-05-24 21:53:52 +10:00
parent 766feec4c0
commit 7d48c9fa90
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -39,17 +39,20 @@
let mut background_${name} = background_${name}::SpecifiedValue(Vec::new()); let mut background_${name} = background_${name}::SpecifiedValue(Vec::new());
% endfor % endfor
try!(input.parse_comma_separated(|input| { try!(input.parse_comma_separated(|input| {
// background-color can only be in the last element, so if it
// is parsed anywhere before, the value is invalid.
if background_color.is_some() {
return Err(());
}
% for name in "image position repeat size attachment origin clip".split(): % for name in "image position repeat size attachment origin clip".split():
let mut ${name} = None; let mut ${name} = None;
% endfor % endfor
loop { loop {
if let Ok(value) = input.try(|i| CSSColor::parse(context, i)) { if background_color.is_none() {
if background_color.is_none() { if let Ok(value) = input.try(|i| CSSColor::parse(context, i)) {
background_color = Some(value); background_color = Some(value);
continue continue
} else {
// color can only be the last element
return Err(())
} }
} }
if position.is_none() { if position.is_none() {