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

style: Make PercentageOrNumber also reject negative percentages.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2017-03-26 19:56:25 +02:00
parent c2d9f663af
commit 372379428b
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
2 changed files with 20 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/style/values/specified/mod.rs
View file

@ -585,13 +585,12 @@ pub enum NumberOrPercentage {
no_viewport_percentage!(NumberOrPercentage);
impl Parse for NumberOrPercentage {
fn parse(context: &ParserContext, input: &mut Parser) -> Result<Self, ()> {
if let Ok(per) = input.try(|input| Percentage::parse(context, input)) {
fn parse(_context: &ParserContext, input: &mut Parser) -> Result<Self, ()> {
if let Ok(per) = input.try(Percentage::parse_non_negative) {
return Ok(NumberOrPercentage::Percentage(per));
}
let num = try!(Number::parse_non_negative(input));
Ok(NumberOrPercentage::Number(num))
Number::parse_non_negative(input).map(NumberOrPercentage::Number)
}
}