Refactor AsyncCallStackTracker to hide private implementation inner class.

Source/core/inspector/AsyncCallStackTracker.cpp

 /*
  * 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 15 matching lines @@
  * 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.
  */
 
 #include "config.h"
 #include "core/inspector/AsyncCallStackTracker.h"
 
 #include "bindings/core/v8/V8Binding.h"
 #include "bindings/core/v8/V8RecursionScope.h"
+#include "core/dom/ContextLifecycleObserver.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/dom/ExecutionContextTask.h"
 #include "core/dom/Microtask.h"
 #include "core/events/Event.h"
 #include "core/events/EventTarget.h"
 #include "core/xmlhttprequest/XMLHttpRequest.h"
 #include "core/xmlhttprequest/XMLHttpRequestUpload.h"
 #include "wtf/text/StringBuilder.h"
 #include "wtf/text/StringHash.h"
 #include <v8.h>
 
 namespace {
 
 static const char setTimeoutName[] = "setTimeout";
 static const char setIntervalName[] = "setInterval";
 static const char requestAnimationFrameName[] = "requestAnimationFrame";
 static const char xhrSendName[] = "XMLHttpRequest.send";
 static const char enqueueMutationRecordName[] = "Mutation";
 
 }
 
 namespace blink {
 
-void AsyncCallStackTracker::ExecutionContextData::contextDestroyed()
-{
-    ASSERT(executionContext());
-    OwnPtrWillBeRawPtr<ExecutionContextData> self = m_tracker->m_executionContextDataMap.take(executionContext());
-    ASSERT_UNUSED(self, self == this);
-    ContextLifecycleObserver::contextDestroyed();
-}
+class AsyncCallStackTracker::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)
+    {
+    }
 
-int AsyncCallStackTracker::ExecutionContextData::circularSequentialID()
-{
-    ++m_circularSequentialID;
-    if (m_circularSequentialID <= 0)
-        m_circularSequentialID = 1;
-    return m_circularSequentialID;
-}
+    virtual void contextDestroyed() override
+    {
+        ASSERT(executionContext());
+        OwnPtrWillBeRawPtr<ExecutionContextData> self = adoptPtrWillBeNoop(m_tracker->m_executionContextDataMap.take(executionContext()));
+        ASSERT_UNUSED(self, self == this);
+        ContextLifecycleObserver::contextDestroyed();
+    }
 
-void AsyncCallStackTracker::ExecutionContextData::trace(Visitor* visitor)
-{
-    visitor->trace(m_tracker);
+    int circularSequentialID()
+    {
+        ++m_circularSequentialID;
+        if (m_circularSequentialID <= 0)
+            m_circularSequentialID = 1;
+        return m_circularSequentialID;
+    }
+
+    void trace(Visitor* visitor)
+    {
+        visitor->trace(m_tracker);
 #if ENABLE(OILPAN)
-    visitor->trace(m_timerCallChains);
-    visitor->trace(m_animationFrameCallChains);
-    visitor->trace(m_eventCallChains);
-    visitor->trace(m_xhrCallChains);
-    visitor->trace(m_mutationObserverCallChains);
-    visitor->trace(m_executionContextTaskCallChains);
-    visitor->trace(m_v8AsyncTaskCallChains);
-    visitor->trace(m_asyncOperationCallChains);
+        visitor->trace(m_timerCallChains);
+        visitor->trace(m_animationFrameCallChains);
+        visitor->trace(m_eventCallChains);
+        visitor->trace(m_xhrCallChains);
+        visitor->trace(m_mutationObserverCallChains);
+        visitor->trace(m_executionContextTaskCallChains);
+        visitor->trace(m_v8AsyncTaskCallChains);
+        visitor->trace(m_asyncOperationCallChains);
 #endif
-}
+    }
+
+private:
+    int m_circularSequentialID;
+
+public:

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

Just move these fields above the private: section header.

+    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;
+};
 
 static XMLHttpRequest* toXmlHttpRequest(EventTarget* eventTarget)
 {
     const AtomicString& interfaceName = eventTarget->interfaceName();
     if (interfaceName == EventTargetNames::XMLHttpRequest)
         return static_cast<XMLHttpRequest*>(eventTarget);
     if (interfaceName == EventTargetNames::XMLHttpRequestUpload)
         return static_cast<XMLHttpRequestUpload*>(eventTarget)->xmlHttpRequest();
     return 0;
 }
@@ skipping 348 matching lines @@
 
 bool AsyncCallStackTracker::validateCallFrames(const ScriptValue& callFrames)
 {
     return !callFrames.isEmpty() || m_currentAsyncCallChain;
 }
 
 AsyncCallStackTracker::ExecutionContextData* AsyncCallStackTracker::createContextDataIfNeeded(ExecutionContext* context)
 {
     ExecutionContextData* data = m_executionContextDataMap.get(context);
     if (!data) {
-        data = m_executionContextDataMap.set(context, adoptPtrWillBeNoop(new AsyncCallStackTracker::ExecutionContextData(this, context)))

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

Please revert this. The code before your change followed the guideline that
every new allocation is immediately wrapped into adopt*() call and hence stored
in a smart pointer.

-            .storedValue->value.get();
+        data = new AsyncCallStackTracker::ExecutionContextData(this, context);
+        m_executionContextDataMap.set(context, data);
     }
     return data;
 }
 
 void AsyncCallStackTracker::clear()
 {
     m_currentAsyncCallChain.clear();
     m_nestedAsyncCallCount = 0;
+#if ENABLE(OILPAN)
     m_executionContextDataMap.clear();
+#else
+    ExecutionContextDataMap copy;
+    m_executionContextDataMap.swap(copy);
+    for (ExecutionContextDataMap::const_iterator it = copy.begin(); it != copy.end(); ++it)
+        delete it->value;
+#endif
 }
 
 void AsyncCallStackTracker::trace(Visitor* visitor)
 {
     visitor->trace(m_currentAsyncCallChain);
 #if ENABLE(OILPAN)
     visitor->trace(m_executionContextDataMap);
 #endif
 }
 
 } // namespace blink