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

Source/core/animation/DocumentTimeline.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 18 matching lines @@
  */
 
 #ifndef DocumentTimeline_h
 #define DocumentTimeline_h
 
 #include "core/animation/AnimationEffect.h"
 #include "core/animation/AnimationPlayer.h"
 #include "core/dom/Element.h"
 #include "core/events/Event.h"
 #include "platform/Timer.h"
+#include "platform/heap/Handle.h"
 #include "wtf/RefCounted.h"
 #include "wtf/RefPtr.h"
 #include "wtf/Vector.h"
 
 namespace WebCore {
 
 class Document;
 class TimedItem;
 
 // DocumentTimeline is constructed and owned by Document, and tied to its lifecycle.
-class DocumentTimeline : public RefCounted<DocumentTimeline> {
+class DocumentTimeline : public RefCountedWillBeGarbageCollectedFinalized<DocumentTimeline> {
 public:
-    class PlatformTiming {
+    class PlatformTiming : public NoBaseWillBeGarbageCollectedFinalized<PlatformTiming> {
 
     public:
         // Calls DocumentTimeline's wake() method after duration seconds.
         virtual void wakeAfter(double duration) = 0;
         virtual void cancelWake() = 0;
         virtual void serviceOnNextFrame() = 0;
         virtual ~PlatformTiming() { }
-
+        virtual void trace(Visitor*) = 0;

[Mads Ager (chromium), 2014/05/15 08:36:54]

Let's provide a default implementation for trace to avoid pure virtual trace
methods?

[haraken, 2014/05/16 07:41:22]

Done.

     };
 
-    static PassRefPtr<DocumentTimeline> create(Document*, PassOwnPtr<PlatformTiming> = nullptr);
+    static PassRefPtrWillBeRawPtr<DocumentTimeline> create(Document*, PassOwnPtrWillBeRawPtr<PlatformTiming> = nullptr);
     ~DocumentTimeline();
 
     void serviceAnimations(TimingUpdateReason);
 
     // Creates a player attached to this timeline, but without a start time.
     AnimationPlayer* createAnimationPlayer(TimedItem*);
     AnimationPlayer* play(TimedItem*);
 
+#if !ENABLE(OILPAN)
     void playerDestroyed(AnimationPlayer* player)
     {
         ASSERT(m_players.contains(player));
         m_players.remove(player);
     }
+#endif
 
     // Called from setReadyState() in Document.cpp to set m_zeroTime to
     // performance.timing.domInteractive
     void setZeroTime(double);
     bool hasStarted() const { return !isNull(m_zeroTime); }
     bool hasPendingUpdates() const { return !m_playersNeedingUpdate.isEmpty(); }
     double zeroTime() const { return m_zeroTime; }
     double currentTime(bool& isNull);
     double currentTime();
     double currentTimeInternal(bool& isNull);
     double currentTimeInternal();
     double effectiveTime();
     void pauseAnimationsForTesting(double);
     size_t numberOfActiveAnimationsForTesting() const;
 
     void setOutdatedAnimationPlayer(AnimationPlayer*);
     bool hasOutdatedAnimationPlayer() const;
 
-    Document* document() { return m_document; }
+    Document* document() { return m_document.get(); }
+#if !ENABLE(OILPAN)
     void detachFromDocument();
+#endif
     void wake();
 
+    void trace(Visitor*);
+
 protected:
-    DocumentTimeline(Document*, PassOwnPtr<PlatformTiming>);
+    DocumentTimeline(Document*, PassOwnPtrWillBeRawPtr<PlatformTiming>);
 
 private:
     double m_zeroTime;
-    Document* m_document;
+    RawPtrWillBeMember<Document> m_document;
     // AnimationPlayers which will be updated on the next frame
     // i.e. current, in effect, or had timing changed
-    HashSet<RefPtr<AnimationPlayer> > m_playersNeedingUpdate;
-    HashSet<AnimationPlayer*> m_players;
+    WillBeHeapHashSet<RefPtrWillBeMember<AnimationPlayer> > m_playersNeedingUpdate;
+    WillBeHeapHashSet<RawPtrWillBeWeakMember<AnimationPlayer> > m_players;
 
     friend class SMILTimeContainer;
     static const double s_minimumDelay;
 
-    OwnPtr<PlatformTiming> m_timing;
+    OwnPtrWillBeMember<PlatformTiming> m_timing;
 
     class DocumentTimelineTiming FINAL : public PlatformTiming {
     public:
         DocumentTimelineTiming(DocumentTimeline* documentTimeline)
             : m_timeline(documentTimeline)
             , m_timer(this, &DocumentTimelineTiming::timerFired)
         {
             ASSERT(m_timeline);
         }
 
         virtual void wakeAfter(double duration) OVERRIDE;
         virtual void cancelWake() OVERRIDE;
         virtual void serviceOnNextFrame() OVERRIDE;
 
         void timerFired(Timer<DocumentTimelineTiming>*) { m_timeline->wake(); }
 
+        virtual void trace(Visitor*) OVERRIDE;
+
     private:
-        DocumentTimeline* m_timeline;
+        RawPtrWillBeMember<DocumentTimeline> m_timeline;
         Timer<DocumentTimelineTiming> m_timer;
-
     };
 
     friend class AnimationDocumentTimelineTest;
 };
 
 } // namespace
 
 #endif