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

Auto merge of #15454 - jlevesy:bg-size-reject-negative-values, r=SimonSapin

Browse source 
use `::parse_non_negative instead` of `::parse` for background_size property parsing

Use  `::parse_non_negative` instead of `::parse` for background_size property parsing

---
<!-- 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 #15450

<!-- 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/15454)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-02-09 14:55:14 -08:00 • committed by GitHub
commit ce7827eadf
3 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/style/properties/longhand/background.mako.rs
View file

@ -373,7 +373,7 @@ ${helpers.single_keyword("background-origin",
})
}
pub fn parse(context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue,()> {
pub fn parse(_context: &ParserContext, input: &mut Parser) -> Result<SpecifiedValue,()> {
let width;
if let Ok(value) = input.try(|input| {
match input.next() {
@ -389,7 +389,7 @@ ${helpers.single_keyword("background-origin",
}) {
return Ok(value)
} else {
width = try!(specified::LengthOrPercentageOrAuto::parse(context, input))
width = try!(specified::LengthOrPercentageOrAuto::parse_non_negative(input))
}
let height;
@ -401,7 +401,7 @@ ${helpers.single_keyword("background-origin",
}) {
height = value
} else {
height = try!(specified::LengthOrPercentageOrAuto::parse(context, input));
height = try!(specified::LengthOrPercentageOrAuto::parse_non_negative(input));
}
Ok(SpecifiedValue::Explicit(ExplicitSize {