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

Auto merge of #15867 - servo:negative, r=nox

Browse source 
Reject negative factors in filter functions (fixes #15494)

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/15867)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-03-08 05:28:59 -08:00 • committed by GitHub
commit 1f2e1e8b84
2 changed files with 45 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/style/properties/longhand/effects.mako.rs
View file

@ -367,8 +367,8 @@ ${helpers.predefined_type("clip",
fn parse_factor(input: &mut Parser) -> Result<::values::CSSFloat, ()> {
use cssparser::Token;
match input.next() {
Ok(Token::Number(value)) => Ok(value.value),
Ok(Token::Percentage(value)) => Ok(value.unit_value),
Ok(Token::Number(value)) if value.value.is_sign_positive() => Ok(value.value),
Ok(Token::Percentage(value)) if value.unit_value.is_sign_positive() => Ok(value.unit_value),
_ => Err(())
}
}

43
tests/unit/style/parsing/effects.rs
View file

@ -63,3 +63,46 @@ fn test_effects_parser_exhaustion() {
assert_parser_exhausted!(perspective_origin, "1px some-rubbish", false);
assert_parser_exhausted!(transform_origin, "1px some-rubbish", false);
}
#[test]
fn test_parse_factor() {
use parsing::parse;
use style::properties::longhands::filter;
assert!(parse(filter::parse, "brightness(0)").is_ok());
assert!(parse(filter::parse, "brightness(55)").is_ok());
assert!(parse(filter::parse, "brightness(100)").is_ok());
assert!(parse(filter::parse, "contrast(0)").is_ok());
assert!(parse(filter::parse, "contrast(55)").is_ok());
assert!(parse(filter::parse, "contrast(100)").is_ok());
assert!(parse(filter::parse, "grayscale(0)").is_ok());
assert!(parse(filter::parse, "grayscale(55)").is_ok());
assert!(parse(filter::parse, "grayscale(100)").is_ok());
assert!(parse(filter::parse, "invert(0)").is_ok());
assert!(parse(filter::parse, "invert(55)").is_ok());
assert!(parse(filter::parse, "invert(100)").is_ok());
assert!(parse(filter::parse, "opacity(0)").is_ok());
assert!(parse(filter::parse, "opacity(55)").is_ok());
assert!(parse(filter::parse, "opacity(100)").is_ok());
assert!(parse(filter::parse, "sepia(0)").is_ok());
assert!(parse(filter::parse, "sepia(55)").is_ok());
assert!(parse(filter::parse, "sepia(100)").is_ok());
assert!(parse(filter::parse, "saturate(0)").is_ok());
assert!(parse(filter::parse, "saturate(55)").is_ok());
assert!(parse(filter::parse, "saturate(100)").is_ok());
// Negative numbers are invalid for certain filters
assert!(parse(filter::parse, "brightness(-1)").is_err());
assert!(parse(filter::parse, "contrast(-1)").is_err());
assert!(parse(filter::parse, "grayscale(-1)").is_err());
assert!(parse(filter::parse, "invert(-1)").is_err());
assert!(parse(filter::parse, "opacity(-1)").is_err());
assert!(parse(filter::parse, "sepia(-1)").is_err());
assert!(parse(filter::parse, "saturate(-1)").is_err());
}