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

Reverse Number and LengthOrPercentage in LengthOrPercentageOrNumber

Browse source 
"0" must be parsed as the number 0, not the unitless 0px length.
This commit is contained in:
Anthony Ramine 2017-04-28 11:51:24 +02:00
parent f1287814db
commit 193e1d5569
6 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1191,7 +1191,7 @@ impl ToComputedValue for SVGPaintKind {
}
/// <length> | <percentage> | <number>
pub type LengthOrPercentageOrNumber = Either<LengthOrPercentage, Number>;
pub type LengthOrPercentageOrNumber = Either<Number, LengthOrPercentage>;
impl LengthOrPercentageOrNumber {
/// parse a <length-percentage> | <number> enforcing that the contents aren't negative
@ -1199,10 +1199,10 @@ impl LengthOrPercentageOrNumber {
// NB: Parse numbers before Lengths so we are consistent about how to
// recognize and serialize "0".
if let Ok(num) = input.try(|i| Number::parse_non_negative(context, i)) {
return Ok(Either::Second(num))
return Ok(Either::First(num))
}
LengthOrPercentage::parse_non_negative(context, input).map(Either::First)
LengthOrPercentage::parse_non_negative(context, input).map(Either::Second)
}
}