Auto merge of #14605 - emilio:crashtest-bug-1323717, r=SimonSapin

style: Avoid ending up with an invalid keyframe when inf or NaN are a…  Fixes: https://bugzilla.mozilla.org/show_bug.cgi?id=1323717 r? @SimonSapin  --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14605)
servo · Dec 16, 2016 · da42fea · da42fea
2 parents 7fecaa3 + fa01716
commit da42fea
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 2 deletions.
diff --git a/components/style/keyframes.rs b/components/style/keyframes.rs
@@ -50,10 +50,11 @@ impl KeyframePercentage {
             KeyframePercentage::new(1.)
         } else {
             let percentage = try!(input.expect_percentage());
-            if percentage > 1. || percentage < 0. {
+            if percentage >= 0. && percentage <= 1. {
+                KeyframePercentage::new(percentage)
+            } else {
                 return Err(());
             }
-            KeyframePercentage::new(percentage)
         };
 
         Ok(percentage)

diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -8294,6 +8294,12 @@
             "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": [
           {
             "path": "mozilla/lenient_this.html",

diff --git a/tests/wpt/mozilla/tests/mozilla/keyframe-infinite-percentage.html b/tests/wpt/mozilla/tests/mozilla/keyframe-infinite-percentage.html
@@ -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>