Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-03 21:43:41 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #16646 - nox:loponu, r=emilio

Browse source 
Reverse Number and LengthOrPercentage in LengthOrPercentageOrNumber

"0" must be parsed as the number 0, not the unitless 0px length.

<!-- 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/16646)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-04-29 12:11:51 -05:00 • committed by GitHub
commit 5dac4fbd2d
6 changed files with 18 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/style/properties/gecko.mako.rs
View file

@ -3784,8 +3784,8 @@ clip-path
for (mut gecko, servo) in self.gecko.mStrokeDasharray.iter_mut().zip(v.0.into_iter()) { for (mut gecko, servo) in self.gecko.mStrokeDasharray.iter_mut().zip(v.0.into_iter()) {
match servo { match servo {
Either::First(lop) => gecko.set(lop), Either::First(number) => gecko.set_value(CoordDataValue::Factor(number)),
Either::Second(number) => gecko.set_value(CoordDataValue::Factor(number)), Either::Second(lop) => gecko.set(lop),
} }
} }
} }

8
components/style/properties/longhand/box.mako.rs
View file

@ -2008,8 +2008,8 @@ ${helpers.predefined_type("scroll-snap-coordinate",
m32: Number::from_computed_value(&computed.m32), m32: Number::from_computed_value(&computed.m32),
m33: Number::from_computed_value(&computed.m33), m33: Number::from_computed_value(&computed.m33),
m34: Number::from_computed_value(&computed.m34), m34: Number::from_computed_value(&computed.m34),
m41: Either::First(LengthOrPercentage::from_computed_value(&computed.m41)), m41: Either::Second(LengthOrPercentage::from_computed_value(&computed.m41)),
m42: Either::First(LengthOrPercentage::from_computed_value(&computed.m42)), m42: Either::Second(LengthOrPercentage::from_computed_value(&computed.m42)),
m43: LengthOrNumber::from_computed_value(&Either::First(computed.m43)), m43: LengthOrNumber::from_computed_value(&Either::First(computed.m43)),
m44: Number::from_computed_value(&computed.m44), m44: Number::from_computed_value(&computed.m44),
}); });
@ -2056,8 +2056,8 @@ ${helpers.predefined_type("scroll-snap-coordinate",
// LengthOrPercentage. Number maps into Length // LengthOrPercentage. Number maps into Length
fn lopon_to_lop(value: &ComputedLoPoNumber) -> ComputedLoP { fn lopon_to_lop(value: &ComputedLoPoNumber) -> ComputedLoP {
match *value { match *value {
Either::First(length_or_percentage) => length_or_percentage, Either::First(number) => ComputedLoP::Length(Au::from_f32_px(number)),
Either::Second(number) => ComputedLoP::Length(Au::from_f32_px(number)), Either::Second(length_or_percentage) => length_or_percentage,
} }
} }

2
components/style/properties/longhand/inherited_svg.mako.rs
View file

@ -92,7 +92,7 @@ ${helpers.predefined_type("stroke-opacity", "Opacity", "1.0",
${helpers.predefined_type("stroke-dasharray", ${helpers.predefined_type("stroke-dasharray",
"LengthOrPercentageOrNumber", "LengthOrPercentageOrNumber",
"Either::Second(0.0)", "Either::First(0.0)",
"parse_non_negative", "parse_non_negative",
vector="True", vector="True",
allow_empty="True", allow_empty="True",

2
components/style/values/computed/mod.rs
View file

@ -468,7 +468,7 @@ impl ToCss for SVGPaint {
} }
/// <length> | <percentage> | <number> /// <length> | <percentage> | <number>
pub type LengthOrPercentageOrNumber = Either<LengthOrPercentage, Number>; pub type LengthOrPercentageOrNumber = Either<Number, LengthOrPercentage>;
#[derive(Clone, PartialEq, Eq, Copy, Debug)] #[derive(Clone, PartialEq, Eq, Copy, Debug)]
#[cfg_attr(feature = "servo", derive(HeapSizeOf))] #[cfg_attr(feature = "servo", derive(HeapSizeOf))]

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

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

7
tests/unit/style/parsing/length.rs
View file

@ -8,6 +8,8 @@ use parsing::parse;
use style::context::QuirksMode; use style::context::QuirksMode;
use style::parser::{LengthParsingMode, Parse, ParserContext}; use style::parser::{LengthParsingMode, Parse, ParserContext};
use style::stylesheets::{CssRuleType, Origin}; use style::stylesheets::{CssRuleType, Origin};
use style::values::Either;
use style::values::specified::{LengthOrPercentageOrNumber, Number};
use style::values::specified::length::{AbsoluteLength, Length, NoCalcLength}; use style::values::specified::length::{AbsoluteLength, Length, NoCalcLength};
use style_traits::ToCss; use style_traits::ToCss;
@ -46,3 +48,8 @@ fn test_length_parsing_modes() {
assert!(result.is_ok()); assert!(result.is_ok());
assert_eq!(result.unwrap(), Length::NoCalc(NoCalcLength::Absolute(AbsoluteLength::Px(1.)))); assert_eq!(result.unwrap(), Length::NoCalc(NoCalcLength::Absolute(AbsoluteLength::Px(1.))));
} }
#[test]
fn test_zero_percentage_length_or_number() {
assert_eq!(parse(LengthOrPercentageOrNumber::parse, "0"), Ok(Either::First(Number::new(0.))));
}