servo: Merge #15340 - Reject negative value for border-image-width (from upsuper:border-image-width); r=Wafflespeanut

Source-Repo: https://github.com/servo/servo
Source-Revision: 8aa23b46db300210b67c16190c794bc9ee216f3f
This commit is contained in:
Xidorn Quan 2017-02-02 01:10:21 -08:00
parent 9c33ad6815
commit fa2d49cb0e

View File

@ -521,12 +521,12 @@ ${helpers.single_keyword("-moz-float-edge", "content-box margin-box",
} }
impl Parse for SingleSpecifiedValue { impl Parse for SingleSpecifiedValue {
fn parse(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> { fn parse(_context: &ParserContext, input: &mut Parser) -> Result<Self, ()> {
if input.try(|input| input.expect_ident_matching("auto")).is_ok() { if input.try(|input| input.expect_ident_matching("auto")).is_ok() {
return Ok(SingleSpecifiedValue::Auto); return Ok(SingleSpecifiedValue::Auto);
} }
if let Ok(len) = input.try(|input| LengthOrPercentage::parse(context, input)) { if let Ok(len) = input.try(|input| LengthOrPercentage::parse_non_negative(input)) {
return Ok(SingleSpecifiedValue::LengthOrPercentage(len)); return Ok(SingleSpecifiedValue::LengthOrPercentage(len));
} }