wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1161320 - Fix conflict between finishing and aborting a pause; r=jwatt

Browse Source 
Animation::ResumeAt contains an assertion that, when we exit the play-pending
state, checks we either have a resolved start time or a resolved hold time.

That's normally true but if we are aborting a pause on animation that is
finished we can end up with a resolved start time (since we don't clear the
start time when we're aborting a pause) and a resolved hold time (either
because the regular finishing behavior set one, or, because play() applied
auto-rewinding behavior and set it).

In that case we should actually respect the hold time and update the start time
when resuming the animation. However, ResumeAt won't update the start time if it
is already set.

This patch fixes that by clearing the start time in DoPlay in the case where we
are aborting a pause and have a hold time.
This commit is contained in:
Brian Birtles 2015-05-08 16:17:13 +09:00
parent 058f304862
commit 09b59559e6
5 changed files with 87 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dom/animation/Animation.cpp
View File

@ -576,10 +576,18 @@ Animation::DoPlay(LimitBehavior aLimitBehavior)
return;
}
// Clear the start time until we resolve a new one (unless we are aborting
// a pending pause operation, in which case we keep the old start time so
// that the animation continues moving uninterrupted by the aborted pause).
if (!abortedPause) {
// Clear the start time until we resolve a new one. We do this except
// for the case where we are aborting a pause and don't have a hold time.
//
// If we're aborting a pause and *do* have a hold time (e.g. because
// the animation is finished or we just applied the auto-rewind behavior
// above) we should respect it by clearing the start time. If we *don't*
// have a hold time we should keep the current start time so that the
// the animation continues moving uninterrupted by the aborted pause.
//
// (If we're not aborting a pause, mHoldTime must be resolved by now
// or else we would have returned above.)
if (!mHoldTime.IsNull()) {
mStartTime.SetNull();
}

23
dom/animation/test/css-animations/file_animation-currenttime.html
View File

@ -542,6 +542,29 @@ test(function(t) {
'The currentTime of a cancelled animation should be null');
}, 'Animation.currentTime after cancelling');
async_test(function(t) {
var div = addDiv(t, {'class': 'animated-div'});
div.style.animation = 'anim 100s';
var animation = div.getAnimations()[0];
animation.ready.then(t.step_func(function() {
animation.finish();
// Initiate a pause then abort it
animation.pause();
animation.play();
// Wait to return to running state
return animation.ready;
})).then(t.step_func(function() {
assert_true(animation.currentTime < 100 * 1000,
'After aborting a pause when finished, the currentTime should'
+ ' jump back towards the start of the animation');
t.done();
}));
}, 'After aborting a pause when finished, the call to play() should rewind'
+ ' the current time');
done();
</script>
</body>

25
layout/style/crashtests/1161320-1.html Normal file
View File

@ -0,0 +1,25 @@
<!doctype html>
<html class="reftest-wait">
<head>
<meta charset=utf-8>
<style>
@keyframes a { }
body {
animation-name: a;
}
</style>
<script>
function boom()
{
var body = document.body;
body.style.animationPlayState = 'paused';
window.getComputedStyle(body).animationPlayState;
body.style.animationPlayState = 'running';
document.documentElement.removeAttribute("class");
}
</script>
</head>
<body onload="setTimeout(boom, 100);"></body>
</html>

25
layout/style/crashtests/1161320-2.html Normal file
View File

@ -0,0 +1,25 @@
<!doctype html>
<html class="reftest-wait">
<head>
<meta charset=utf-8>
<style>
@keyframes a { }
body {
animation: a 100s;
}
</style>
<script>
function boom()
{
var anim = document.body.getAnimations()[0];
anim.finish();
anim.pause();
anim.play();
document.documentElement.removeAttribute("class");
}
</script>
</head>
<body onload="setTimeout(boom, 100);"></body>
</html>

2
layout/style/crashtests/crashtests.list
View File

@ -113,6 +113,8 @@ load 1074651-1.html
pref(dom.webcomponents.enabled,true) load 1089463-1.html
pref(layout.css.expensive-style-struct-assertions.enabled,true) load 1136010-1.html
load 1153693-1.html
load 1161320-1.html
pref(dom.animations-api.core.enabled,true) load 1161320-2.html
load 1161366-1.html
load 1163446-1.html
load large_border_image_width.html