Auto merge of #14347 - jcdyer:cdyer/len-parsing, r=Wafflespeanut

Only allow border-image-outset to use non-negative numbers.

Restricts border-image-outline to only allow positive values.

Fixes #14295

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #14295.

<!-- Either: -->
- [x] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/14347)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-11-23 12:30:41 -08:00 committed by GitHub
commit 210b1be1d0
3 changed files with 34 additions and 6 deletions

View file

@ -242,7 +242,7 @@ ${helpers.single_keyword("-moz-float-edge", "content-box margin-box",
pub fn parse(_context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue, ()> {
let mut values = vec![];
for _ in 0..4 {
let value = input.try(|input| LengthOrNumber::parse(input));
let value = input.try(|input| LengthOrNumber::parse_non_negative(input));
match value {
Ok(val) => values.push(val),
Err(_) => break,

View file

@ -1009,3 +1009,13 @@ impl Parse for LengthOrPercentageOrAutoOrContent {
}
pub type LengthOrNumber = Either<Length, Number>;
impl LengthOrNumber {
pub fn parse_non_negative(input: &mut Parser) -> Result<Self, ()> {
if let Ok(v) = input.try(|i| Length::parse_non_negative(i)) {
Ok(Either::First(v))
} else {
Number::parse_non_negative(input).map(Either::Second)
}
}
}