aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2018-12-15 13:41:49 -0500
committerGitHub <noreply@github.com>2018-12-15 13:41:49 -0500
commit6731ddd29f40f05ebb65fef0b1164c8632a7872a (patch)
tree8a49622eafa013b9140ed5ee1b9b7a29b3ecf350
parent8da0947a6b24609a3dd5d817156094fa117df906 (diff)
parente11878129d819ad3e910296ebc6add304da0c306 (diff)
downloadservo-6731ddd29f40f05ebb65fef0b1164c8632a7872a.tar.gz
servo-6731ddd29f40f05ebb65fef0b1164c8632a7872a.zip
Auto merge of #22447 - servo:jdm-patch-10, r=ferjm
Add another layer of rAF to avoid intermittent failures. Hopefully fixes #22445. <!-- 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/22447) <!-- Reviewable:end -->
-rw-r--r--tests/wpt/mozilla/meta/MANIFEST.json2
-rw-r--r--tests/wpt/mozilla/tests/mozilla/animation-removed-node.html8
2 files changed, 6 insertions, 4 deletions
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 4bcfa348648..5283e0ae9cb 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -26620,7 +26620,7 @@
"testharness"
],
"mozilla/animation-removed-node.html": [
- "6ba0318ea1e07b42ef444f838753adbefe9633d6",
+ "a2f9dfe284a22a6241290c86841172387dcdbeb6",
"testharness"
],
"mozilla/binding_keyword.html": [
diff --git a/tests/wpt/mozilla/tests/mozilla/animation-removed-node.html b/tests/wpt/mozilla/tests/mozilla/animation-removed-node.html
index 6ba0318ea1e..a2f9dfe284a 100644
--- a/tests/wpt/mozilla/tests/mozilla/animation-removed-node.html
+++ b/tests/wpt/mozilla/tests/mozilla/animation-removed-node.html
@@ -19,9 +19,11 @@ div.test { animation: boo 1s infinite; }
document.getElementById('second').style.display = 'none';
// Ensure that we wait until the next layout is complete.
requestAnimationFrame(t.step_func(function() {
- // Verify that the previous animations are no longer considered active.
- assert_equals(window.runningAnimationCount, 0);
- t.done();
+ requestAnimationFrame(t.step_func(function() {
+ // Verify that the previous animations are no longer considered active.
+ assert_equals(window.runningAnimationCount, 0);
+ t.done();
+ });
}));
});
}, "Animations are no longer active when a node can't be animated.");