Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(771)

Unified Diff: Source/core/dom/ScriptedAnimationController.h

Issue 341433003: Oilpan: Prepare to move ScriptedAnimationController to Oilpan heap. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/dom/ScriptedAnimationController.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/ScriptedAnimationController.h
diff --git a/Source/core/dom/ScriptedAnimationController.h b/Source/core/dom/ScriptedAnimationController.h
index acb2f2d627dd72123b0307e80813c1596cfabfd8..c148a2f77cbbd86feffb97416d03434abec31515 100644
--- a/Source/core/dom/ScriptedAnimationController.h
+++ b/Source/core/dom/ScriptedAnimationController.h
@@ -40,14 +40,15 @@ class Event;
class EventTarget;
class RequestAnimationFrameCallback;
-class ScriptedAnimationController : public RefCounted<ScriptedAnimationController> {
+class ScriptedAnimationController : public RefCountedWillBeGarbageCollectedFinalized<ScriptedAnimationController> {
haraken 2014/06/17 06:44:48 Can this be RefCountedWillBeGarbageCollected?
tkent 2014/06/17 06:50:32 No. CallbackList needs finalization.
public:
- static PassRefPtr<ScriptedAnimationController> create(Document* document)
+ static PassRefPtrWillBeRawPtr<ScriptedAnimationController> create(Document* document)
{
- return adoptRef(new ScriptedAnimationController(document));
+ return adoptRefWillBeNoop(new ScriptedAnimationController(document));
}
~ScriptedAnimationController();
haraken 2014/06/17 06:44:48 Then you'll need to use DEFINE_EMPTY_DESTRUCTOR_WI
- void clearDocumentPointer() { m_document = 0; }
+ void trace(Visitor*);
+ void clearDocumentPointer() { m_document = nullptr; }
typedef int CallbackId;
@@ -73,11 +74,11 @@ private:
CallbackList m_callbacks;
CallbackList m_callbacksToInvoke; // only non-empty while inside executeCallbacks
- Document* m_document;
+ RawPtrWillBeMember<Document> m_document;
CallbackId m_nextCallbackId;
int m_suspendCount;
- WillBePersistentHeapVector<RefPtrWillBeMember<Event> > m_eventQueue;
- ListHashSet<std::pair<const EventTarget*, const StringImpl*> > m_perFrameEvents;
+ WillBeHeapVector<RefPtrWillBeMember<Event> > m_eventQueue;
+ WillBeHeapListHashSet<std::pair<RawPtrWillBeMember<const EventTarget>, const StringImpl*> > m_perFrameEvents;
};
}
« no previous file with comments | « Source/core/dom/Document.cpp ('k') | Source/core/dom/ScriptedAnimationController.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698