diff --git a/dom/animation/test/chrome/test_animate_xrays.html b/dom/animation/test/chrome/test_animate_xrays.html index 991f2becd846..c164837540ae 100644 --- a/dom/animation/test/chrome/test_animate_xrays.html +++ b/dom/animation/test/chrome/test_animate_xrays.html @@ -19,7 +19,7 @@ var win = document.getElementById('iframe').contentWindow; async_test(function(t) { window.addEventListener('load', t.step_func(function() { var target = win.document.getElementById('target'); - var anim = target.animate({ opacity: [ 0, 1 ] }, 2 * MS_PER_SEC); + var anim = target.animate({ opacity: [ 0, 1 ] }, 100 * MS_PER_SEC); // In the x-ray case, the frames object will be given an opaque wrapper // so it won't be possible to fetch any frames from it. assert_equals(anim.effect.getFrames().length, 0); diff --git a/dom/animation/test/chrome/test_animation_observers.html b/dom/animation/test/chrome/test_animation_observers.html index 69269cd626cb..2015af86252b 100644 --- a/dom/animation/test/chrome/test_animation_observers.html +++ b/dom/animation/test/chrome/test_animation_observers.html @@ -1525,27 +1525,27 @@ addAsyncAnimTest("tree_ordering", { observe: div, subtree: true }, function*() { [ div, pseudoTarget ].forEach(function(target) { addAsyncAnimTest("change_duration_and_currenttime", { observe: div, subtree: true }, function*() { - var anim = target.animate({ opacity: [ 0, 1 ] }, 100 * MS_PER_SEC); + var anim = target.animate({ opacity: [ 0, 1 ] }, 200 * MS_PER_SEC); yield await_frame(); assert_records([{ added: [anim], changed: [], removed: [] }], "records after animation is added"); - anim.effect.timing.duration = 10 * MS_PER_SEC; + anim.effect.timing.duration = 100 * MS_PER_SEC; yield await_frame(); assert_records([{ added: [], changed: [anim], removed: [] }], "records after duration is changed"); - anim.effect.timing.duration = 10 * MS_PER_SEC; + anim.effect.timing.duration = 100 * MS_PER_SEC; yield await_frame(); assert_records([], "records after assigning same value"); - anim.currentTime = 50 * MS_PER_SEC; + anim.currentTime = 500 * MS_PER_SEC; yield await_frame(); assert_records([{ added: [], changed: [], removed: [anim] }], "records after animation end"); - anim.effect.timing.duration = 100 * MS_PER_SEC; + anim.effect.timing.duration = 1000 * MS_PER_SEC; yield await_frame(); assert_records([{ added: [anim], changed: [], removed: [] }], "records after animation restarted"); @@ -1597,7 +1597,8 @@ addAsyncAnimTest("change_enddelay_and_currenttime", addAsyncAnimTest("change_enddelay_and_currenttime", { observe: div, subtree: true }, function*() { var anim = div.animate({ opacity: [ 0, 1 ] }, - { duration: 100, endDelay: -100 }); + { duration: 100 * MS_PER_SEC, + endDelay: -100 * MS_PER_SEC }); yield await_frame(); assert_records([], "records after animation is added"); }); diff --git a/dom/animation/test/chrome/test_animation_properties.html b/dom/animation/test/chrome/test_animation_properties.html index 56861d148d8e..1dae9cc03d2b 100644 --- a/dom/animation/test/chrome/test_animation_properties.html +++ b/dom/animation/test/chrome/test_animation_properties.html @@ -493,7 +493,7 @@ var gTests = [ gTests.forEach(function(subtest) { test(function(t) { var div = addDiv(t); - var animation = div.animate(subtest.frames, 1 * MS_PER_SEC); + var animation = div.animate(subtest.frames, 100 * MS_PER_SEC); assert_properties_equal(animation.effect.getProperties(), subtest.expected); }, subtest.desc); diff --git a/dom/animation/test/chrome/test_running_on_compositor.html b/dom/animation/test/chrome/test_running_on_compositor.html index 8dbe7f81711d..2892aea15ce6 100644 --- a/dom/animation/test/chrome/test_running_on_compositor.html +++ b/dom/animation/test/chrome/test_running_on_compositor.html @@ -287,14 +287,14 @@ promise_test(function(t) { promise_test(function(t) { var div = addDiv(t); - var animation = div.animate({ opacity: [ 0, 1 ] }, 100 * MS_PER_SEC); + var animation = div.animate({ opacity: [ 0, 1 ] }, 200 * MS_PER_SEC); return animation.ready.then(t.step_func(function() { assert_equals(animation.isRunningOnCompositor, omtaEnabled, 'Animation reports that it is running on the compositor'); - animation.currentTime = 50 * MS_PER_SEC; - animation.effect.timing.duration = 10 * MS_PER_SEC; + animation.currentTime = 150 * MS_PER_SEC; + animation.effect.timing.duration = 100 * MS_PER_SEC; assert_equals(animation.isRunningOnCompositor, false, 'Animation reports that it is NOT running on the compositor'