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

Auto merge of #16382 - nox:calc-clamping, r=emilio

Browse source 
Don't reject out of bound calc() values at parsing-time

<!-- 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/16382)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-04-12 13:31:21 -05:00 • committed by GitHub
commit 294f44eca0
7 changed files with 106 additions and 65 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3160,11 +3160,11 @@ fn static_assert() {
self.gecko.mInitialLetterSink = 0;
},
T::Specified(size, sink) => {
self.gecko.mInitialLetterSize = size.value;
self.gecko.mInitialLetterSize = size.get();
if let Some(sink) = sink {
self.gecko.mInitialLetterSink = sink.value();
} else {
self.gecko.mInitialLetterSink = size.value.floor() as i32;
self.gecko.mInitialLetterSink = size.get().floor() as i32;
}
}
}

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

@ -574,8 +574,8 @@ ${helpers.single_keyword("overflow-x", "visible hidden scroll auto",
p2y = try!(specified::parse_number(context, input));
Ok(())
}));
if p1x.value < 0.0 || p1x.value > 1.0 ||
p2x.value < 0.0 || p2x.value > 1.0 {
if p1x.get() < 0.0 || p1x.get() > 1.0 ||
p2x.get() < 0.0 || p2x.get() > 1.0 {
return Err(())
}