Bug 1334582 - Use UINT64_MAX instead of IsInfinite() for checking whe…

…ther TimingParans.mIterations is infinite or not. r=boris Because our ComputedTiming.mCurrentIteration is uint64_t. MozReview-Commit-ID: FjbhEvTUMr4
mozilla-spidermonkey · Sep 11, 2017 · dccd6cb · dccd6cb
1 parent 472e325
commit dccd6cb
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/dom/animation/AnimationEffectReadOnly.cpp b/dom/animation/AnimationEffectReadOnly.cpp
@@ -186,7 +186,7 @@ AnimationEffectReadOnly::GetComputedTimingAt(
   // Determine the 0-based index of the current iteration.
   // https://w3c.github.io/web-animations/#current-iteration
   result.mCurrentIteration =
-    IsInfinite(result.mIterations) &&
+    result.mIterations >= UINT64_MAX &&
       result.mPhase == ComputedTiming::AnimationPhase::After
     ? UINT64_MAX // In GetComputedTimingDictionary(),
                  // we will convert this into Infinity

diff --git a/dom/animation/test/crashtests/1334582-1.html b/dom/animation/test/crashtests/1334582-1.html
@@ -0,0 +1,11 @@
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="UTF-8">
+<script>
+window.onload = function(){
+  let a = document.documentElement.animate([], {"iterations": 1.7976931348623157e+308, "fill": "both"});
+};
+</script>
+</head>
+</html>
diff --git a/dom/animation/test/crashtests/crashtests.list b/dom/animation/test/crashtests/crashtests.list
@@ -23,6 +23,7 @@ pref(dom.animations-api.core.enabled,true) load 1330190-2.html
 pref(dom.animations-api.core.enabled,true) load 1330513-1.html
 pref(dom.animations-api.core.enabled,true) load 1333539-1.html
 pref(dom.animations-api.core.enabled,true) load 1333539-2.html
+pref(dom.animations-api.core.enabled,true) load 1334582-1.html
 pref(dom.animations-api.core.enabled,true) load 1334583-1.html
 pref(dom.animations-api.core.enabled,true) load 1335998-1.html
 pref(dom.animations-api.core.enabled,true) load 1343589-1.html