Web Animations: Make AnimationPlayer an ActiveDOMObject

Source/core/animation/AnimationPlayer.h

 /*
  * 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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef AnimationPlayer_h
 #define AnimationPlayer_h
 
 #include "core/animation/AnimationSource.h"
+#include "core/dom/ActiveDOMObject.h"
 #include "core/events/EventTarget.h"
 #include "wtf/RefPtr.h"
 
 namespace WebCore {
 
 class AnimationTimeline;
 class ExceptionState;
 
-class AnimationPlayer FINAL : public RefCountedWillBeRefCountedGarbageCollected<AnimationPlayer>, public EventTargetWithInlineData {
+class AnimationPlayer FINAL : public RefCountedWillBeRefCountedGarbageCollected<AnimationPlayer>
+    , public ActiveDOMObject
+    , public EventTargetWithInlineData {
     DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<AnimationPlayer>);
 public:
 
     ~AnimationPlayer();
-    static PassRefPtrWillBeRawPtr<AnimationPlayer> create(AnimationTimeline&, AnimationSource*);
+    static PassRefPtrWillBeRawPtr<AnimationPlayer> create(ExecutionContext&, AnimationTimeline&, AnimationSource*);
 
     // Returns whether the player is finished.
     bool update(TimingUpdateReason);
 
     // timeToEffectChange returns:
     //  infinity  - if this player is no longer in effect
     //  0         - if this player requires an update on the next frame
     //  n         - if this player requires an update after 'n' units of time
     double timeToEffectChange();
 
@@ skipping 12 matching lines @@
     void finish(ExceptionState&);
     bool finished() { return limited(currentTimeInternal()); }
     // FIXME: Resolve whether finished() should just return the flag, and
     // remove this method.
     bool finishedInternal() const { return m_finished; }
 
     DEFINE_ATTRIBUTE_EVENT_LISTENER(finish);
 
     virtual const AtomicString& interfaceName() const OVERRIDE;
     virtual ExecutionContext* executionContext() const OVERRIDE;
+    virtual bool hasPendingActivity() const OVERRIDE;
+    virtual void stop();

[haraken, 2014/05/26 01:16:09]

Add OVERRIDE.

[dstockwell, 2014/05/26 01:32:40]

Done.

+    virtual bool dispatchEvent(PassRefPtrWillBeRawPtr<Event>) OVERRIDE;
 
     double playbackRate() const { return m_playbackRate; }
     void setPlaybackRate(double);
     const AnimationTimeline* timeline() const { return m_timeline; }
     AnimationTimeline* timeline() { return m_timeline; }
 
 #if !ENABLE(OILPAN)
     void timelineDestroyed() { m_timeline = nullptr; }
 #endif
 
@@ skipping 52 matching lines @@
     // Checks if the AnimationStack is the last reference holder to the Player.
     // This won't be needed when AnimationPlayer is moved to Oilpan.
     bool canFree() const;
 #endif
 
     virtual bool addEventListener(const AtomicString& eventType, PassRefPtr<EventListener>, bool useCapture = false) OVERRIDE;
 
     void trace(Visitor*);
 
 private:
-    AnimationPlayer(AnimationTimeline&, AnimationSource*);
+    AnimationPlayer(ExecutionContext&, AnimationTimeline&, AnimationSource*);
     double sourceEnd() const;
     bool limited(double currentTime) const;
     double currentTimeWithoutLag() const;
     double currentTimeWithLag() const;
     void updateTimingState(double newCurrentTime);
     void updateCurrentTimingState();
 
     double m_playbackRate;
     double m_startTime;
     double m_holdTime;
     double m_storedTimeLag;
 
     SortInfo m_sortInfo;
 
     RefPtrWillBeMember<AnimationSource> m_content;
     RawPtrWillBeMember<AnimationTimeline> m_timeline;
     // Reflects all pausing, including via pauseForTesting().
     bool m_paused;
     bool m_held;
     bool m_isPausedForTesting;
 
     // This indicates timing information relevant to the player has changed by
     // means other than the ordinary progression of time
     bool m_outdated;
 
     bool m_finished;
+    // Holds a 'finished' event queued for asynchronous dispatch via the
+    // ScriptedAnimationController. This object remains active until the
+    // event is actually dispatched.
+    RefPtrWillBeMember<Event> m_pendingFinishedEvent;
 };
 
 } // namespace
 
 #endif