DevTools: simplify the async instrumentation harness.

third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.h

Index: third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.h
diff --git a/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.h b/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.h
index 0f67f4f2b14a4715f364c4cd62228ca037f0a1b9..41c96dac7091bd09339a9533cc3ffa31f3b1f331 100644
--- a/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.h
+++ b/third_party/WebKit/Source/platform/v8_inspector/V8DebuggerAgentImpl.h
@@ -17,7 +17,6 @@ namespace blink {
 class InjectedScriptManager;
 class JavaScriptCallFrame;
 class PromiseTracker;
-class V8AsyncCallTracker;
 class V8StackTraceImpl;
 
 namespace protocol {
@@ -149,12 +148,12 @@ public:
     void setBreakpointAt(const String16& scriptId, int lineNumber, int columnNumber, BreakpointSource, const String16& condition = String16());
     void removeBreakpointAt(const String16& scriptId, int lineNumber, int columnNumber, BreakpointSource);
 
-    // Async call stacks implementation
-    int traceAsyncOperationStarting(const String16& description) override;
-    void traceAsyncCallbackStarting(int operationId) override;
-    void traceAsyncCallbackCompleted() override;
-    void traceAsyncOperationCompleted(int operationId) override;
-    bool trackingAsyncCalls() const override { return m_maxAsyncCallStackDepth; }
+    // Async call stacks implementation.
+    void scheduleAsyncTask(const String16& taskName, void* task, bool recurring) override;
+    void cancelAsyncTask(void* task) override;
+    void cancelAllAsyncTasks() override;
+    void asyncTaskStarted(void* task) override;
+    void asyncTaskFinished(void* task) override;
 
     void reset();
 
@@ -181,8 +180,7 @@ private:
     PassOwnPtr<protocol::Array<protocol::Debugger::CallFrame>> currentCallFrames(ErrorString*);
     PassOwnPtr<protocol::Runtime::StackTrace> currentAsyncStackTrace();
 
-    void clearCurrentAsyncOperation();
-    void resetAsyncCallTracker();
+    void resetAsyncCallStacks();
 
     void changeJavaScriptRecursionLevel(int step);
 
@@ -238,17 +236,10 @@ private:
     int m_recursionLevelForStepFrame;
     bool m_skipAllPauses;
 
-    // This field must be destroyed before the listeners set above.
-    OwnPtr<V8AsyncCallTracker> m_v8AsyncCallTracker;
-
-    using AsyncOperationIdToStackTrace = protocol::HashMap<int, OwnPtr<V8StackTraceImpl>>;
-    AsyncOperationIdToStackTrace m_asyncOperations;
-    int m_lastAsyncOperationId;
+    using AsyncTaskToStackTrace = protocol::HashMap<void*, OwnPtr<V8StackTraceImpl>>;
+    AsyncTaskToStackTrace m_asyncTaskStacks;
     int m_maxAsyncCallStackDepth;
-    OwnPtr<V8StackTraceImpl> m_currentAsyncCallChain;
-    unsigned m_nestedAsyncCallCount;
-    int m_currentAsyncOperationId;
-    bool m_pendingTraceAsyncOperationCompleted;
+    Vector<void*> m_currentTasks;
     protocol::HashMap<String16, protocol::Vector<std::pair<int, int>>> m_blackboxedPositions;
 };