DevTools: simplify the async instrumentation harness.

third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp

Index: third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp
diff --git a/third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp b/third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp
index 660db57ab106c9f2eb90dd7c7b0817467cb16edb..b4bbe26ab04d75365a6d3e7b0bd8cf71d37b937d 100644
--- a/third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp
+++ b/third_party/WebKit/Source/core/inspector/InspectorDebuggerAgent.cpp
@@ -30,7 +30,6 @@
 #include "core/inspector/InspectorDebuggerAgent.h"
 
 #include "bindings/core/v8/V8Binding.h"
-#include "core/inspector/AsyncCallTracker.h"
 #include "core/inspector/MuteConsoleScope.h"
 #include "platform/ScriptForbiddenScope.h"
 #include "platform/v8_inspector/public/V8Debugger.h"
@@ -58,7 +57,6 @@ InspectorDebuggerAgent::~InspectorDebuggerAgent()
 
 DEFINE_TRACE(InspectorDebuggerAgent)
 {
-    visitor->trace(m_asyncCallTracker);
     InspectorBaseAgent<InspectorDebuggerAgent, protocol::Frontend::Debugger>::trace(visitor);
 }
 
@@ -72,7 +70,6 @@ void InspectorDebuggerAgent::enable(ErrorString* errorString)
 
 void InspectorDebuggerAgent::disable(ErrorString* errorString)
 {
-    setTrackingAsyncCalls(false);
     m_state->setBoolean(DebuggerAgentState::debuggerEnabled, false);
     m_instrumentingAgents->setInspectorDebuggerAgent(nullptr);
     m_v8DebuggerAgent->disable(errorString);
@@ -251,7 +248,6 @@ void InspectorDebuggerAgent::getBacktrace(ErrorString* errorString,
 void InspectorDebuggerAgent::setAsyncCallStackDepth(ErrorString* errorString, int inMaxDepth)
 {
     m_v8DebuggerAgent->setAsyncCallStackDepth(errorString, inMaxDepth);
-    setTrackingAsyncCalls(m_v8DebuggerAgent->trackingAsyncCalls());
 }
 
 void InspectorDebuggerAgent::setBlackboxedRanges(
@@ -284,6 +280,36 @@ void InspectorDebuggerAgent::didExecuteScript()
     m_v8DebuggerAgent->didExecuteScript();
 }
 
+void InspectorDebuggerAgent::scheduleAsyncTask(const String& taskName, void* task)
+{
+    m_v8DebuggerAgent->scheduleAsyncTask(taskName, task, false);
+}
+
+void InspectorDebuggerAgent::scheduleAsyncTask(const String& operationName, void* task, bool recurring)
+{
+    m_v8DebuggerAgent->scheduleAsyncTask(operationName, task, recurring);
+}
+
+void InspectorDebuggerAgent::cancelAsyncTask(void* task)
+{
+    m_v8DebuggerAgent->cancelAsyncTask(task);
+}
+
+void InspectorDebuggerAgent::cancelAllAsyncTasks()
+{
+    m_v8DebuggerAgent->cancelAllAsyncTasks();
+}
+
+void InspectorDebuggerAgent::asyncTaskStarted(void* task)
+{
+    m_v8DebuggerAgent->asyncTaskStarted(task);
+}
+
+void InspectorDebuggerAgent::asyncTaskFinished(void* task)
+{
+    m_v8DebuggerAgent->asyncTaskFinished(task);
+}
+
 // InspectorBaseAgent overrides.
 void InspectorDebuggerAgent::setState(protocol::DictionaryValue* state)
 {
@@ -291,11 +317,6 @@ void InspectorDebuggerAgent::setState(protocol::DictionaryValue* state)
     m_v8DebuggerAgent->setInspectorState(m_state);
 }
 
-void InspectorDebuggerAgent::init()
-{
-    m_asyncCallTracker = new AsyncCallTracker(m_v8DebuggerAgent.get(), m_instrumentingAgents.get());
-}
-
 void InspectorDebuggerAgent::setFrontend(protocol::Frontend* frontend)
 {
     InspectorBaseAgent::setFrontend(frontend);
@@ -315,7 +336,6 @@ void InspectorDebuggerAgent::restore()
     m_v8DebuggerAgent->restore();
     ErrorString errorString;
     enable(&errorString);
-    setTrackingAsyncCalls(m_v8DebuggerAgent->trackingAsyncCalls());
 }
 
 void InspectorDebuggerAgent::discardAgent()
@@ -323,11 +343,4 @@ void InspectorDebuggerAgent::discardAgent()
     m_v8DebuggerAgent.clear();
 }
 
-void InspectorDebuggerAgent::setTrackingAsyncCalls(bool tracking)
-{
-    m_asyncCallTracker->asyncCallTrackingStateChanged(tracking);
-    if (!tracking)
-        m_asyncCallTracker->resetAsyncOperations();
-}
-
 } // namespace blink