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 #14605 - emilio:crashtest-bug-1323717, r=SimonSapin

Browse source 
style: Avoid ending up with an invalid keyframe when inf or NaN are a…

<!-- Please describe your changes on the following line: -->

Fixes: https://bugzilla.mozilla.org/show_bug.cgi?id=1323717

r? @SimonSapin

<!-- 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/14605)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-12-15 17:45:12 -08:00 • committed by GitHub
commit da42fea6b2
3 changed files with 24 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
components/style/keyframes.rs
View file

@ -50,10 +50,11 @@ impl KeyframePercentage {
KeyframePercentage::new(1.) KeyframePercentage::new(1.)
} else { } else {
let percentage = try!(input.expect_percentage()); let percentage = try!(input.expect_percentage());
if percentage > 1. || percentage < 0. { if percentage >= 0. && percentage <= 1. {
KeyframePercentage::new(percentage)
} else {
return Err(()); return Err(());
} }
KeyframePercentage::new(percentage)
}; };
Ok(percentage) Ok(percentage)

6
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -8294,6 +8294,12 @@
"url": "/_mozilla/mozilla/iterable.html" "url": "/_mozilla/mozilla/iterable.html"
} }
], ],
"mozilla/keyframe-infinite-percentage.html": [
{
"path": "mozilla/keyframe-infinite-percentage.html",
"url": "/_mozilla/mozilla/keyframe-infinite-percentage.html"
}
],
"mozilla/lenient_this.html": [ "mozilla/lenient_this.html": [
{ {
"path": "mozilla/lenient_this.html", "path": "mozilla/lenient_this.html",

15
tests/wpt/mozilla/tests/mozilla/keyframe-infinite-percentage.html Normal file
View file

@ -0,0 +1,15 @@
<!doctype html>
<meta charset="utf-8">
<title>Shouldn't end up with an invalid keyframe when inf or nan are at play.</title>
<script src="/resources/testharness.js"></script>
<script src="/resources/testharnessreport.js"></script>
<style>
@keyframes anim {
0e309% {}
}
</style>
<script>
test(function() {
assert_true(true, "Doesn't crash");
}, "Doesn't crash");
</script>