Oilpan: Prepare moving AsyncCallStackTracker to Oilpan

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 38 matching lines @@
 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 {
 
-class AsyncCallStackTracker::ExecutionContextData FINAL : public ContextLifecycleObserver {
-    WTF_MAKE_FAST_ALLOCATED;
+class AsyncCallStackTracker::ExecutionContextData FINAL : public NoBaseWillBeGarbageCollectedFinalized<AsyncCallStackTracker::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
     {
         ASSERT(executionContext());
         ExecutionContextData* self = m_tracker->m_executionContextDataMap.take(executionContext());

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

this should have been: OwnPtr<ExecutionContextData> self = adoptPtr(...);

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

Done.

         ASSERT(self == this);
         ContextLifecycleObserver::contextDestroyed();
         delete self;

[haraken, 2014/08/11 10:59:59]

This would be wrong. We cannot explicitly destroy on-heap objects.

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

Done.

     }
 
     int circularSequentialID()
     {
         ++m_circularSequentialID;
         if (m_circularSequentialID <= 0)
             m_circularSequentialID = 1;
         return m_circularSequentialID;
     }
 
+    void trace(Visitor* visitor)
+    {
+        visitor->trace(m_tracker);
+        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);
+    }
+
 private:
     int m_circularSequentialID;
 
 public:
-    AsyncCallStackTracker* m_tracker;
+    RawPtrWillBeMember<AsyncCallStackTracker> m_tracker;
     HashSet<int> m_intervalTimerIds;
-    WillBePersistentHeapHashMap<int, RefPtrWillBeMember<AsyncCallChain> > m_timerCallChains;
-    WillBePersistentHeapHashMap<int, RefPtrWillBeMember<AsyncCallChain> > m_animationFrameCallChains;
-    WillBePersistentHeapHashMap<RawPtrWillBeMember<Event>, RefPtrWillBeMember<AsyncCallChain> > m_eventCallChains;
-    WillBePersistentHeapHashMap<RawPtrWillBeMember<EventTarget>, RefPtrWillBeMember<AsyncCallChain> > m_xhrCallChains;
-    WillBePersistentHeapHashMap<RawPtrWillBeMember<MutationObserver>, RefPtrWillBeMember<AsyncCallChain> > m_mutationObserverCallChains;
-    WillBePersistentHeapHashMap<ExecutionContextTask*, RefPtrWillBeMember<AsyncCallChain> > m_executionContextTaskCallChains;
-    WillBePersistentHeapHashMap<String, RefPtrWillBeMember<AsyncCallChain> > m_v8AsyncTaskCallChains;
-    WillBePersistentHeapHashMap<int, RefPtrWillBeMember<AsyncCallChain> > m_asyncOperationCallChains;
+    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 363 matching lines @@
 void AsyncCallStackTracker::clear()
 {
     m_currentAsyncCallChain.clear();
     m_nestedAsyncCallCount = 0;
     ExecutionContextDataMap copy;
     m_executionContextDataMap.swap(copy);
     for (ExecutionContextDataMap::const_iterator it = copy.begin(); it != copy.end(); ++it)
         delete it->value;
 }
 
+void AsyncCallStackTracker::trace(Visitor* visitor)
+{
+    visitor->trace(m_currentAsyncCallChain);
+    visitor->trace(m_executionContextDataMap);
+}
+
 } // namespace blink