Oilpan: Completely move core/animations/ to oilpan's heap

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 22 matching lines @@
 
 #include "core/animation/TimedItem.h"
 #include "core/events/EventTarget.h"
 #include "wtf/RefPtr.h"
 
 namespace WebCore {
 
 class DocumentTimeline;
 class ExceptionState;
 
-class AnimationPlayer FINAL : public RefCounted<AnimationPlayer>, public EventTargetWithInlineData {
-    REFCOUNTED_EVENT_TARGET(AnimationPlayer);
+class AnimationPlayer FINAL : public RefCountedWillBeRefCountedGarbageCollected<AnimationPlayer>, public EventTargetWithInlineData {
+    DEFINE_EVENT_TARGET_REFCOUNTING(RefCountedWillBeRefCountedGarbageCollected<AnimationPlayer>);
 public:
 
     ~AnimationPlayer();
-    static PassRefPtr<AnimationPlayer> create(DocumentTimeline&, TimedItem*);
+    static PassRefPtrWillBeRawPtr<AnimationPlayer> create(DocumentTimeline&, TimedItem*);
 
     // 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 18 matching lines @@
     DEFINE_ATTRIBUTE_EVENT_LISTENER(finish);
 
     virtual const AtomicString& interfaceName() const OVERRIDE;
     virtual ExecutionContext* executionContext() const OVERRIDE;
 
     double playbackRate() const { return m_playbackRate; }
     void setPlaybackRate(double);
     const DocumentTimeline* timeline() const { return m_timeline; }
     DocumentTimeline* timeline() { return m_timeline; }
 
-    void timelineDestroyed() { m_timeline = 0; }
+#if !ENABLE(OILPAN)
+    void timelineDestroyed() { m_timeline = nullptr; }
+#endif
 
     bool hasStartTime() const { return !isNull(m_startTime); }
     double startTime() const { return m_startTime * 1000; }
     double startTimeInternal() const { return m_startTime; }
     void setStartTime(double startTime) { setStartTimeInternal(startTime / 1000); }
     void setStartTimeInternal(double, bool isUpdateFromCompositor = false);
 
     const TimedItem* source() const { return m_content.get(); }
     TimedItem* source() { return m_content.get(); }
     TimedItem* source(bool& isNull) { isNull = !m_content; return m_content.get(); }
@@ skipping 19 matching lines @@
 
     class SortInfo {
     public:
         friend class AnimationPlayer;
         bool operator<(const SortInfo& other) const;
         double startTime() const { return m_startTime; }
     private:
         SortInfo(unsigned sequenceNumber, double startTime)
             : m_sequenceNumber(sequenceNumber)
             , m_startTime(startTime)
-        { }
+        {
+        }
         unsigned m_sequenceNumber;
         double m_startTime;
     };
 
     const SortInfo& sortInfo() const { return m_sortInfo; }
 
     static bool hasLowerPriority(AnimationPlayer* player1, AnimationPlayer* player2)
     {
         return player1->sortInfo() < player2->sortInfo();
     }
 
+#if !ENABLE(OILPAN)
     // 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(DocumentTimeline&, TimedItem*);
     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;
 
-    RefPtr<TimedItem> m_content;
-    // FIXME: We should keep the timeline alive and have this as non-null
-    // but this is tricky to do without Oilpan
-    DocumentTimeline* m_timeline;
+    RefPtrWillBeMember<TimedItem> m_content;
+    RawPtrWillBeMember<DocumentTimeline> 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;
 };
 
 } // namespace
 
 #endif