Refactor AsyncCallStackTracker to hide private implementation inner class.

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 14 matching lines @@
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (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 AsyncCallStackTracker_h
 #define AsyncCallStackTracker_h
 
 #include "bindings/core/v8/ScriptValue.h"
-#include "core/dom/ContextLifecycleObserver.h"
 #include "wtf/Deque.h"
 #include "wtf/HashMap.h"
 #include "wtf/HashSet.h"
 #include "wtf/Noncopyable.h"
 #include "wtf/PassRefPtr.h"
 #include "wtf/RefPtr.h"
 
 namespace blink {
 
 class Event;
@@ skipping 25 matching lines @@
     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;
     };
 
-    class ExecutionContextData final : public NoBaseWillBeGarbageCollectedFinalized<ExecutionContextData>, public ContextLifecycleObserver {
-        WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
-    public:
-        ExecutionContextData(AsyncCallStackTracker* tracker, ExecutionContext* executionContext)
-            : ContextLifecycleObserver(executionContext)
-            , m_circularSequentialID(0)
-            , m_tracker(tracker)
-        {
-        }
-
-        virtual void contextDestroyed() override;
-
-        int circularSequentialID();
-
-        void trace(Visitor*);
-
-    private:
-        int m_circularSequentialID;
-
-    public:
-        RawPtrWillBeMember<AsyncCallStackTracker> m_tracker;
-        HashSet<int> m_intervalTimerIds;
-        WillBeHeapHashMap<int, RefPtrWillBeMember<AsyncCallChain> > m_timerCallChains;
-        WillBeHeapHashMap<int, RefPtrWillBeMember<AsyncCallChain> > m_animationFrameCallChains;
-        WillBeHeapHashMap<RawPtrWillBeMember<Event>, RefPtrWillBeMember<AsyncCallChain> > m_eventCallChains;
-        WillBeHeapHashMap<RawPtrWillBeMember<EventTarget>, RefPtrWillBeMember<AsyncCallChain> > m_xhrCallChains;
-        WillBeHeapHashMap<RawPtrWillBeMember<MutationObserver>, RefPtrWillBeMember<AsyncCallChain> > m_mutationObserverCallChains;
-        WillBeHeapHashMap<ExecutionContextTask*, RefPtrWillBeMember<AsyncCallChain> > m_executionContextTaskCallChains;
-        WillBeHeapHashMap<String, RefPtrWillBeMember<AsyncCallChain> > m_v8AsyncTaskCallChains;
-        WillBeHeapHashMap<int, RefPtrWillBeMember<AsyncCallChain> > m_asyncOperationCallChains;
-    };
-
     AsyncCallStackTracker();
 
     bool isEnabled() const { return m_maxAsyncCallStackDepth; }
     void setAsyncCallStackDepth(int);
     const AsyncCallChain* currentAsyncCallChain() const;
 
     void didInstallTimer(ExecutionContext*, int timerId, bool singleShot, const ScriptValue& callFrames);
     void didRemoveTimer(ExecutionContext*, int timerId);
     void willFireTimer(ExecutionContext*, int timerId);
 
@@ skipping 31 matching lines @@
 
 private:
     void willHandleXHREvent(XMLHttpRequest*, Event*);
 
     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;
     RefPtrWillBeMember<AsyncCallChain> m_currentAsyncCallChain;
     unsigned m_nestedAsyncCallCount;
-    typedef WillBeHeapHashMap<RawPtrWillBeMember<ExecutionContext>, OwnPtrWillBeMember<ExecutionContextData> > ExecutionContextDataMap;
+    // Cannot use OwnPtrWillBeMember<ExecutionContextData> w/o making ExecutionContextData a complete public type.

[yurys, 2014/11/11 12:31:37]

I guess adding explicit destructor and moving its implementation into .cpp file
would make it possible to use OwnPtr as map values here. Alternatively you could
turn m_executionContextDataMap into an OwnPtr

+    typedef WillBeHeapHashMap<RawPtrWillBeMember<ExecutionContext>, RawPtrWillBeMember<ExecutionContextData> > ExecutionContextDataMap;
     ExecutionContextDataMap m_executionContextDataMap;
 };
 
 } // namespace blink
 
 #endif // !defined(AsyncCallStackTracker_h)