Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-10-04 02:29:12 +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

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