Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1069)

Unified Diff: Source/core/inspector/AsyncCallStackTracker.cpp

Issue 413113003: Oilpan: Prepare moving AsyncCallChain to Oilpan (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Created 6 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/core/inspector/AsyncCallStackTracker.cpp
diff --git a/Source/core/inspector/AsyncCallStackTracker.cpp b/Source/core/inspector/AsyncCallStackTracker.cpp
index 7bdaf7342363d2b784b9155110eedac91376cd65..a76c6bcab1f0fa537c2866cb38500389814160c9 100644
--- a/Source/core/inspector/AsyncCallStackTracker.cpp
+++ b/Source/core/inspector/AsyncCallStackTracker.cpp
@@ -89,14 +89,14 @@ private:
public:
AsyncCallStackTracker* m_tracker;
HashSet<int> m_intervalTimerIds;
- HashMap<int, RefPtr<AsyncCallChain> > m_timerCallChains;
- HashMap<int, RefPtr<AsyncCallChain> > m_animationFrameCallChains;
- HashMap<Event*, RefPtr<AsyncCallChain> > m_eventCallChains;
- HashMap<EventTarget*, RefPtr<AsyncCallChain> > m_xhrCallChains;
- HashMap<MutationObserver*, RefPtr<AsyncCallChain> > m_mutationObserverCallChains;
- HashMap<ExecutionContextTask*, RefPtr<AsyncCallChain> > m_executionContextTaskCallChains;
- HashMap<String, RefPtr<AsyncCallChain> > m_v8AsyncTaskCallChains;
- HashMap<int, RefPtr<AsyncCallChain> > m_asyncOperationCallChains;
+ WillBePersistentHeapHashMap<int, RefPtrWillBeMember<AsyncCallChain> > m_timerCallChains;
+ WillBePersistentHeapHashMap<int, RefPtrWillBeMember<AsyncCallChain> > m_animationFrameCallChains;
+ WillBePersistentHeapHashMap<Event*, RefPtrWillBeMember<AsyncCallChain> > m_eventCallChains;
tkent 2014/07/29 02:33:54 Event* should be WeakMember<Event> or Member<Event
keishi 2014/07/29 07:56:36 Done.
+ WillBePersistentHeapHashMap<EventTarget*, RefPtrWillBeMember<AsyncCallChain> > m_xhrCallChains;
haraken 2014/07/29 03:43:39 EventTarget is on-heap as well.
keishi 2014/07/29 07:56:36 Done.
+ WillBePersistentHeapHashMap<MutationObserver*, RefPtrWillBeMember<AsyncCallChain> > m_mutationObserverCallChains;
haraken 2014/07/29 03:43:39 MutationObserver is on-heap as well.
keishi 2014/07/29 07:56:36 Done.
+ WillBePersistentHeapHashMap<ExecutionContextTask*, RefPtrWillBeMember<AsyncCallChain> > m_executionContextTaskCallChains;
+ WillBePersistentHeapHashMap<String, RefPtrWillBeMember<AsyncCallChain> > m_v8AsyncTaskCallChains;
+ WillBePersistentHeapHashMap<int, RefPtrWillBeMember<AsyncCallChain> > m_asyncOperationCallChains;
};
static XMLHttpRequest* toXmlHttpRequest(EventTarget* eventTarget)
@@ -109,6 +109,11 @@ static XMLHttpRequest* toXmlHttpRequest(EventTarget* eventTarget)
return 0;
}
+void AsyncCallStackTracker::AsyncCallChain::trace(Visitor* visitor)
+{
+ visitor->trace(m_callStacks);
+}
+
AsyncCallStackTracker::AsyncCallStack::AsyncCallStack(const String& description, const ScriptValue& callFrames)
: m_description(description)
, m_callFrames(callFrames)
@@ -411,19 +416,19 @@ void AsyncCallStackTracker::didFireAsyncCall()
clearCurrentAsyncCallChain();
}
-PassRefPtr<AsyncCallStackTracker::AsyncCallChain> AsyncCallStackTracker::createAsyncCallChain(const String& description, const ScriptValue& callFrames)
+PassRefPtrWillBeRawPtr<AsyncCallStackTracker::AsyncCallChain> AsyncCallStackTracker::createAsyncCallChain(const String& description, const ScriptValue& callFrames)
{
if (callFrames.isEmpty()) {
ASSERT(m_currentAsyncCallChain);
return m_currentAsyncCallChain; // Propogate async call stack chain.
}
- RefPtr<AsyncCallChain> chain = adoptRef(m_currentAsyncCallChain ? new AsyncCallStackTracker::AsyncCallChain(*m_currentAsyncCallChain) : new AsyncCallStackTracker::AsyncCallChain());
+ RefPtrWillBeRawPtr<AsyncCallChain> chain = adoptRefWillBeNoop(m_currentAsyncCallChain ? new AsyncCallStackTracker::AsyncCallChain(*m_currentAsyncCallChain) : new AsyncCallStackTracker::AsyncCallChain());
ensureMaxAsyncCallChainDepth(chain.get(), m_maxAsyncCallStackDepth - 1);
- chain->m_callStacks.prepend(adoptRef(new AsyncCallStackTracker::AsyncCallStack(description, callFrames)));
+ chain->m_callStacks.prepend(adoptRefWillBeNoop(new AsyncCallStackTracker::AsyncCallStack(description, callFrames)));
return chain.release();
}
-void AsyncCallStackTracker::setCurrentAsyncCallChain(ExecutionContext* context, PassRefPtr<AsyncCallChain> chain)
+void AsyncCallStackTracker::setCurrentAsyncCallChain(ExecutionContext* context, PassRefPtrWillBeRawPtr<AsyncCallChain> chain)
{
if (chain && !V8RecursionScope::recursionLevel(toIsolate(context))) {
// Current AsyncCallChain corresponds to the bottommost JS call frame.

Powered by Google App Engine
This is Rietveld 408576698