Blink Animation: Request serviceOnNextFrame on animation's finish and cancel.

third_party/WebKit/Source/core/animation/Animation.cpp

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 429 matching lines @@
     setCurrentTimeInternal(currentTime, TimingUpdateOnDemand);
   }
   updateCurrentTimingState(TimingUpdateOnDemand);
   double newCurrentTime = currentTimeInternal();
 
   if (previousCurrentTime != newCurrentTime) {
     setOutdated();
   } else if (!hadStartTime && m_timeline) {
     // Even though this animation is not outdated, time to effect change is
     // infinity until start time is set.
-    m_timeline->wake();
+    forceServiceOnNextFrame();
   }
 }
 
 void Animation::setEffect(AnimationEffectReadOnly* newEffect) {
   if (m_content == newEffect)
     return;
   PlayStateUpdateScope updateScope(*this, TimingUpdateOnDemand,
                                    SetCompositorPendingWithEffectChanged);
 
   double storedCurrentTime = currentTimeInternal();
@@ skipping 151 matching lines @@
   // Avoid updating start time when already finished.
   if (calculatePlayState() == Finished)
     return;
 
   double newCurrentTime = m_playbackRate < 0 ? 0 : effectEnd();
   setCurrentTimeInternal(newCurrentTime, TimingUpdateOnDemand);
   m_paused = false;
   m_currentTimePending = false;
   m_startTime = calculateStartTime(newCurrentTime);
   m_playState = Finished;
+  forceServiceOnNextFrame();
 }
 
 ScriptPromise Animation::finished(ScriptState* scriptState) {
   if (!m_finishedPromise) {
     m_finishedPromise = new AnimationPromise(scriptState->getExecutionContext(),
                                              this, AnimationPromise::Finished);
     if (playStateInternal() == Finished)
       m_finishedPromise->resolve(this);
   }
   return m_finishedPromise->promise(scriptState->world());
@@ skipping 74 matching lines @@
 }
 
 void Animation::setOutdated() {
   if (m_outdated)
     return;
   m_outdated = true;
   if (m_timeline)
     m_timeline->setOutdatedAnimation(this);
 }
 
+void Animation::forceServiceOnNextFrame() {
+  m_timeline->wake();
+}
+
 bool Animation::canStartAnimationOnCompositor() const {
   if (m_isCompositedAnimationDisabledForTesting || effectSuppressed())
     return false;
 
   // FIXME: Timeline playback rates should be compositable
   if (m_playbackRate == 0 || (std::isinf(effectEnd()) && m_playbackRate < 0) ||
       (timeline() && timeline()->playbackRate() != 1))
     return false;
 
   return m_timeline && m_content && m_content->isKeyframeEffectReadOnly() &&
@@ skipping 151 matching lines @@
   PlayStateUpdateScope updateScope(*this, TimingUpdateOnDemand);
 
   if (playStateInternal() == Idle)
     return;
 
   m_held = false;
   m_paused = false;
   m_playState = Idle;
   m_startTime = nullValue();
   m_currentTimePending = false;
+  forceServiceOnNextFrame();
 }
 
 void Animation::beginUpdatingState() {
   // Nested calls are not allowed!
   DCHECK(!m_stateIsBeingUpdated);
   m_stateIsBeingUpdated = true;
 }
 
 void Animation::endUpdatingState() {
   DCHECK(m_stateIsBeingUpdated);
@@ skipping 217 matching lines @@
   visitor->trace(m_timeline);
   visitor->trace(m_pendingFinishedEvent);
   visitor->trace(m_pendingCancelledEvent);
   visitor->trace(m_finishedPromise);
   visitor->trace(m_readyPromise);
   EventTargetWithInlineData::trace(visitor);
   ActiveDOMObject::trace(visitor);
 }
 
 }  // namespace blink