| Index: Source/core/inspector/AsyncCallStackTracker.h
|
| diff --git a/Source/core/inspector/AsyncCallStackTracker.h b/Source/core/inspector/AsyncCallStackTracker.h
|
| index 4fba41e3d06c386655737f54ecff8b6d412f758d..906b5fa38ff027319148a6d78dd7f273e358164b 100644
|
| --- a/Source/core/inspector/AsyncCallStackTracker.h
|
| +++ b/Source/core/inspector/AsyncCallStackTracker.h
|
| @@ -49,13 +49,14 @@ class ExecutionContextTask;
|
| class MutationObserver;
|
| class XMLHttpRequest;
|
|
|
| -class AsyncCallStackTracker {
|
| +class AsyncCallStackTracker FINAL : public NoBaseWillBeGarbageCollectedFinalized<AsyncCallStackTracker> {
|
| 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:
|
| @@ -63,13 +64,14 @@ public:
|
| ScriptValue m_callFrames;
|
| };
|
|
|
| - typedef Deque<RefPtr<AsyncCallStack>, 4> AsyncCallStackVector;
|
| + typedef WillBeHeapDeque<RefPtrWillBeMember<AsyncCallStack>, 4> AsyncCallStackVector;
|
|
|
| - class AsyncCallChain : public RefCounted<AsyncCallChain> {
|
| + class AsyncCallChain FINAL : public RefCountedWillBeGarbageCollected<AsyncCallChain> {
|
| 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;
|
| @@ -115,11 +117,13 @@ public:
|
| 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);
|
| @@ -128,9 +132,9 @@ private:
|
| ExecutionContextData* createContextDataIfNeeded(ExecutionContext*);
|
|
|
| unsigned m_maxAsyncCallStackDepth;
|
| - RefPtr<AsyncCallChain> m_currentAsyncCallChain;
|
| + RefPtrWillBeMember<AsyncCallChain> m_currentAsyncCallChain;
|
| unsigned m_nestedAsyncCallCount;
|
| - typedef HashMap<ExecutionContext*, ExecutionContextData*> ExecutionContextDataMap;
|
| + typedef WillBeHeapHashMap<RawPtrWillBeMember<ExecutionContext>, OwnPtrWillBeMember<ExecutionContextData> > ExecutionContextDataMap;
|
| ExecutionContextDataMap m_executionContextDataMap;
|
| };
|
|
|
|
|