Prepare SMILTimeContainer for oilpan

Source/core/svg/animation/SMILTimeContainer.h

 /*
  * Copyright (C) 2008 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 11 matching lines @@
  * (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 SMILTimeContainer_h
 #define SMILTimeContainer_h
 
 #include "core/dom/QualifiedName.h"
 #include "core/svg/animation/SMILTime.h"
 #include "platform/Timer.h"
+#include "platform/heap/Handle.h"
 #include "wtf/HashMap.h"
 #include "wtf/HashSet.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefCounted.h"
 #include "wtf/text/StringHash.h"
 #include "wtf/text/WTFString.h"
 
 namespace WebCore {
 
 class Document;
 class SVGElement;
 class SVGSMILElement;
 class SVGSVGElement;
 
-class SMILTimeContainer : public RefCounted<SMILTimeContainer>  {
+class SMILTimeContainer : public RefCountedWillBeGarbageCollectedFinalized<SMILTimeContainer>  {
 public:
-    static PassRefPtr<SMILTimeContainer> create(SVGSVGElement& owner) { return adoptRef(new SMILTimeContainer(owner)); }
+    static PassRefPtrWillBeRawPtr<SMILTimeContainer> create(SVGSVGElement& owner) { return adoptRefWillBeNoop(new SMILTimeContainer(owner)); }
     ~SMILTimeContainer();
 
     void schedule(SVGSMILElement*, SVGElement*, const QualifiedName&);
     void unschedule(SVGSMILElement*, SVGElement*, const QualifiedName&);
     void notifyIntervalsChanged();
 
     SMILTime elapsed() const;
 
     bool isPaused() const;
     bool isStarted() const;
 
     void begin();
     void pause();
     void resume();
     void setElapsed(SMILTime);
 
     void serviceAnimations(double monotonicAnimationStartTime);
     bool hasAnimations() const;
 
     void setDocumentOrderIndexesDirty() { m_documentOrderIndexesDirty = true; }
 
+    void trace(Visitor*);
+
 private:
     SMILTimeContainer(SVGSVGElement& owner);

[haraken, 2014/05/26 08:27:27]

Add explicit.

[kouhei (in TOK), 2014/05/26 08:55:28]

Done.

 
     enum FrameSchedulingState {
         // No frame scheduled.
         Idle,
         // Scheduled a wakeup to update the animation values.
         SynchronizeAnimations,
         // Scheduled a wakeup to trigger an animation frame.
         FutureAnimationFrame,
         // Scheduled a animation frame for continuous update.
         AnimationFrame
@@ skipping 19 matching lines @@
     double m_pauseTime;
     double m_resumeTime;
     double m_accumulatedActiveTime;
     double m_presetStartTime;
 
     FrameSchedulingState m_frameSchedulingState;
     bool m_documentOrderIndexesDirty;
 
     Timer<SMILTimeContainer> m_wakeupTimer;
 
-    typedef pair<SVGElement*, QualifiedName> ElementAttributePair;
-    typedef Vector<SVGSMILElement*> AnimationsVector;
-    typedef HashMap<ElementAttributePair, OwnPtr<AnimationsVector> > GroupedAnimationsMap;
+    typedef pair<RawPtrWillBeWeakMember<SVGElement>, QualifiedName> ElementAttributePair;

[haraken, 2014/05/26 08:27:27]

- Did you confirm that weak processing for pairs works as expected?

- In non-oilpan builds, we should currently have any destructors that remove
entries from m_scheduledAnimations when the SVGElement dies. We should remove
the code from oilpan builds, but where is it?

[kouhei (in TOK), 2014/05/26 08:55:28]

No. I'll add it on HeapTest.cpp
They are handled by
|document().accessSVGExtensions().removeAllElementReferencesForTarget|

[kouhei (in TOK), 2014/05/26 09:12:48]

Actually they are not deleted per HeapTest_HeapWeakPairs.
What can we do in that case? Registering a weak processing hook to be called on
every GC seems to have too much overhead...

[haraken, 2014/05/26 09:17:56]

Erik@: Would you give us any advice? :)

+    typedef WillBeHeapVector<RawPtrWillBeMember<SVGSMILElement> > AnimationsVector;
+    typedef WillBeHeapHashMap<ElementAttributePair, OwnPtrWillBeMember<AnimationsVector> > GroupedAnimationsMap;
     GroupedAnimationsMap m_scheduledAnimations;
 
     SVGSVGElement& m_ownerSVGElement;
 
 #ifndef NDEBUG
     bool m_preventScheduledAnimationsChanges;
 #endif
 };
 }
 
 #endif // SMILTimeContainer_h