Oilpan: Prepare moving AsyncCallChain to Oilpan

Source/core/inspector/AsyncCallStackTracker.h

Index: Source/core/inspector/AsyncCallStackTracker.h
diff --git a/Source/core/inspector/AsyncCallStackTracker.h b/Source/core/inspector/AsyncCallStackTracker.h
index 4fba41e3d06c386655737f54ecff8b6d412f758d..27abc29df47e9dd29554194b29469a141fe74d12 100644
--- a/Source/core/inspector/AsyncCallStackTracker.h
+++ b/Source/core/inspector/AsyncCallStackTracker.h
@@ -52,10 +52,11 @@ class XMLHttpRequest;
 class AsyncCallStackTracker {
     WTF_MAKE_NONCOPYABLE(AsyncCallStackTracker);
 public:
-    class AsyncCallStack : public RefCounted<AsyncCallStack> {
+    class AsyncCallStack FINAL : public RefCountedWillBeGarbageCollectedFinalized<AsyncCallStack> {
     public:
         AsyncCallStack(const String&, const ScriptValue&);
         ~AsyncCallStack();
+        void trace(Visitor*) { }
         String description() const { return m_description; }
         ScriptValue callFrames() const { return m_callFrames; }
     private:
@@ -63,13 +64,14 @@ public:
         ScriptValue m_callFrames;
     };
 
-    typedef Deque<RefPtr<AsyncCallStack>, 4> AsyncCallStackVector;
+    typedef WillBeHeapDeque<RefPtrWillBeMember<AsyncCallStack>, 4> AsyncCallStackVector;
 
-    class AsyncCallChain : public RefCounted<AsyncCallChain> {
+    class AsyncCallChain : public RefCountedWillBeGarbageCollected<AsyncCallChain> {
     public:
         AsyncCallChain() { }
         AsyncCallChain(const AsyncCallChain& t) : m_callStacks(t.m_callStacks) { }
         AsyncCallStackVector callStacks() const { return m_callStacks; }
+        void trace(Visitor*);
     private:
         friend class AsyncCallStackTracker;
         AsyncCallStackVector m_callStacks;
@@ -118,8 +120,8 @@ public:
 private:
     void willHandleXHREvent(XMLHttpRequest*, Event*);
 
-    PassRefPtr<AsyncCallChain> createAsyncCallChain(const String& description, const ScriptValue& callFrames);
-    void setCurrentAsyncCallChain(ExecutionContext*, PassRefPtr<AsyncCallChain>);
+    PassRefPtrWillBeRawPtr<AsyncCallChain> createAsyncCallChain(const String& description, const ScriptValue& callFrames);
+    void setCurrentAsyncCallChain(ExecutionContext*, PassRefPtrWillBeRawPtr<AsyncCallChain>);
     void clearCurrentAsyncCallChain();
     static void ensureMaxAsyncCallChainDepth(AsyncCallChain*, unsigned);
     bool validateCallFrames(const ScriptValue& callFrames);
@@ -128,7 +130,7 @@ private:
     ExecutionContextData* createContextDataIfNeeded(ExecutionContext*);
 
     unsigned m_maxAsyncCallStackDepth;
-    RefPtr<AsyncCallChain> m_currentAsyncCallChain;
+    RefPtrWillBePersistent<AsyncCallChain> m_currentAsyncCallChain;
     unsigned m_nestedAsyncCallCount;
     typedef HashMap<ExecutionContext*, ExecutionContextData*> ExecutionContextDataMap;

[haraken, 2014/07/29 10:19:07]

Not related to this CL, ExecutionContextData* should be an OwnPtr. You can make
the change when moving ExecutionContextData to the heap in a follow-up CL.

     ExecutionContextDataMap m_executionContextDataMap;