Oilpan: Prepare moving AsyncCallStackTracker to Oilpan

Source/core/inspector/AsyncCallStackTracker.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 31 matching lines @@
 namespace blink {
 
 class Event;
 class EventListener;
 class EventTarget;
 class ExecutionContext;
 class ExecutionContextTask;
 class MutationObserver;
 class XMLHttpRequest;
 
-class AsyncCallStackTracker {
+class AsyncCallStackTracker : public NoBaseWillBeGarbageCollectedFinalized<AsyncCallStackTracker> {

[aandrey, 2014/08/11 11:11:04]

FINAL

[keishi, 2014/08/11 13:01:45]

Done.

     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:
         String m_description;
         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> {

[aandrey, 2014/08/11 11:11:04]

FINAL, RefCountedWillBeGarbageCollectedFinalized

[keishi, 2014/08/11 13:01:45]

Added FINAL. AsyncCallChain doesn't seem to require finalization.

     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;
     };
 
     AsyncCallStackTracker();
 
     bool isEnabled() const { return m_maxAsyncCallStackDepth; }
     void setAsyncCallStackDepth(int);
     const AsyncCallChain* currentAsyncCallChain() const;
@@ skipping 25 matching lines @@
     void didEnqueueV8AsyncTask(ExecutionContext*, const String& eventName, int id, const ScriptValue& callFrames);
     void willHandleV8AsyncTask(ExecutionContext*, const String& eventName, int id);
 
     int traceAsyncOperationStarting(ExecutionContext*, const String& operationName, const ScriptValue& callFrames);
     void traceAsyncOperationCompleted(ExecutionContext*, int operationId);
     void traceAsyncCallbackStarting(ExecutionContext*, int operationId);
 
     void didFireAsyncCall();
     void clear();
 
+    void trace(Visitor*);
+
 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);
 
     class ExecutionContextData;
     ExecutionContextData* createContextDataIfNeeded(ExecutionContext*);
 
     unsigned m_maxAsyncCallStackDepth;
-    RefPtr<AsyncCallChain> m_currentAsyncCallChain;
+    RefPtrWillBeMember<AsyncCallChain> m_currentAsyncCallChain;
     unsigned m_nestedAsyncCallCount;
-    typedef HashMap<ExecutionContext*, ExecutionContextData*> ExecutionContextDataMap;
+    typedef WillBeHeapHashMap<ExecutionContext*, OwnPtrWillBeMember<ExecutionContextData> > ExecutionContextDataMap;
     ExecutionContextDataMap m_executionContextDataMap;
 };
 
 } // namespace blink
 
 #endif // !defined(AsyncCallStackTracker_h)