author | Brian Birtles <birtles@gmail.com> |
Fri, 27 Mar 2015 15:56:45 +0900 | |
changeset 236034 | ecac23a4d71331b943e636d1f668555b83294d22 |
parent 236033 | a9ae40ed6d0c1083ce6b39bba1747599a2941bef |
child 236035 | 776865752a675fbb707a9c8bb880af90fa27d029 |
push id | 57572 |
push user | bbirtles@mozilla.com |
push date | Fri, 27 Mar 2015 06:57:17 +0000 |
treeherder | mozilla-inbound@ecac23a4d713 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | jwatt |
bugs | 1109390 |
milestone | 39.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/dom/animation/AnimationPlayer.cpp +++ b/dom/animation/AnimationPlayer.cpp @@ -118,17 +118,22 @@ AnimationPlayer::SilentlySetCurrentTime( } // Implements http://w3c.github.io/web-animations/#set-the-current-time void AnimationPlayer::SetCurrentTime(const TimeDuration& aSeekTime) { SilentlySetCurrentTime(aSeekTime); - // Once pending pause tasks are supported, cancel that here. + if (mPendingState == PendingState::PausePending) { + CancelPendingTasks(); + if (mReady) { + mReady->MaybeResolve(this); + } + } UpdateSourceContent(); PostUpdate(); // FIXME: Once bug 1074630 is fixed, run the procedure to update a player's // finished state for player: // http://w3c.github.io/web-animations/#update-a-players-finished-state }