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

Invalid three value positions are no longer accepted

Browse source
This commit is contained in:
shubDhond 2017-02-23 00:21:19 -05:00
parent 082fbe9e15
commit ddc189c820
3 changed files with 8 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/style/values/specified/position.rs
View file

@ -187,13 +187,11 @@ impl Parse for Position {
} else { } else {
// Handle 3 value background position there are several options: // Handle 3 value background position there are several options:
if let PositionCategory::LengthOrPercentage = category(&first) { if let PositionCategory::LengthOrPercentage = category(&first) {
// "length keyword length" Err(())
Position::new(Some(first), Some(third), None, Some(second))
} else { } else {
if let PositionCategory::LengthOrPercentage = category(&second) { if let PositionCategory::LengthOrPercentage = category(&second) {
if let PositionCategory::LengthOrPercentage = category(&third) { if let PositionCategory::LengthOrPercentage = category(&third) {
// "keyword length length" Err(())
Position::new(Some(second), Some(third), Some(first), None)
} else { } else {
// "keyword length keyword" // "keyword length keyword"
Position::new(Some(second), None, Some(first), Some(third)) Position::new(Some(second), None, Some(first), Some(third))

3
tests/unit/style/parsing/basic_shape.rs
View file

@ -112,9 +112,8 @@ fn test_circle() {
"circle(at 95% 100%)"); "circle(at 95% 100%)");
assert_roundtrip_basicshape!(Circle::parse, "circle(at right 5% bottom 1px)", assert_roundtrip_basicshape!(Circle::parse, "circle(at right 5% bottom 1px)",
"circle(at right 5% bottom 1px)"); "circle(at right 5% bottom 1px)");
assert_roundtrip_basicshape!(Circle::parse, "circle(at 5% bottom 1px)",
"circle(at left 5% bottom 1px)");
assert!(parse(Circle::parse, "circle(at 5% bottom 1px)").is_err());
assert!(parse(Circle::parse, "circle(at top 40%)").is_err()); assert!(parse(Circle::parse, "circle(at top 40%)").is_err());
assert!(parse(Circle::parse, "circle(-10px)").is_err()); assert!(parse(Circle::parse, "circle(-10px)").is_err());
} }

5
tests/unit/style/parsing/position.rs
View file

@ -48,6 +48,11 @@ fn test_position() {
assert_roundtrip_with_context!(Position::parse, "center right 10px", "right 10px center"); assert_roundtrip_with_context!(Position::parse, "center right 10px", "right 10px center");
assert_roundtrip_with_context!(Position::parse, "center bottom 10px", "center bottom 10px"); assert_roundtrip_with_context!(Position::parse, "center bottom 10px", "center bottom 10px");
// Invalid 3 value positions
assert!(parse(Position::parse, "20px 30px 20px").is_err());
assert!(parse(Position::parse, "top 30px 20px").is_err());
assert!(parse(Position::parse, "50% bottom 20%").is_err());
// Only horizontal and vertical keywords can have positions // Only horizontal and vertical keywords can have positions
assert!(parse(Position::parse, "center 10px left 15px").is_err()); assert!(parse(Position::parse, "center 10px left 15px").is_err());
assert!(parse(Position::parse, "center 10px 15px").is_err()); assert!(parse(Position::parse, "center 10px 15px").is_err());