DevTools: [wip] do not use InspectorInstrumentation for will/didProcessTask events.

Source/core/inspector/WorkerDebuggerAgent.cpp

 /*
  * Copyright (C) 2011 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 13 matching lines @@
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "core/inspector/WorkerDebuggerAgent.h"
 
-#include "bindings/core/v8/ScriptDebugServer.h"
+#include "bindings/core/v8/WorkerScriptDebugServer.h"
 #include "core/inspector/InjectedScript.h"
 #include "core/inspector/WorkerInspectorController.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "core/workers/WorkerThread.h"
 #include "wtf/MessageQueue.h"
 
 namespace blink {
 
 namespace {
 
 class RunInspectorCommandsTask final : public ScriptDebugServer::Task {
 public:
-    explicit RunInspectorCommandsTask(WorkerThread* thread)
-        : m_thread(thread) { }
+    explicit RunInspectorCommandsTask(WorkerThread* thread, WebThread::TaskObserver* taskObserver)
+        : m_thread(thread)
+        , m_taskObserver(taskObserver) { }
     virtual ~RunInspectorCommandsTask() { }
     virtual void run() override
     {
-        // Process all queued debugger commands. WorkerThread is certainly
-        // alive if this task is being executed.
-        m_thread->willEnterNestedLoop();
+        m_taskObserver->willProcessTask();
         while (MessageQueueMessageReceived == m_thread->runDebuggerTask(WorkerThread::DontWaitForMessage)) { }
-        m_thread->didLeaveNestedLoop();
+        m_taskObserver->didProcessTask();
     }
 
 private:
     WorkerThread* m_thread;
+    WebThread::TaskObserver* m_taskObserver;
 };
 
 } // namespace
 
-PassOwnPtrWillBeRawPtr<WorkerDebuggerAgent> WorkerDebuggerAgent::create(WorkerScriptDebugServer* scriptDebugServer, WorkerGlobalScope* inspectedWorkerGlobalScope, InjectedScriptManager* injectedScriptManager)
+PassOwnPtrWillBeRawPtr<WorkerDebuggerAgent> WorkerDebuggerAgent::create(WorkerScriptDebugServer* scriptDebugServer, WorkerGlobalScope* inspectedWorkerGlobalScope, InjectedScriptManager* injectedScriptManager, WebThread::TaskObserver* taskObserver)
 {
-    return adoptPtrWillBeNoop(new WorkerDebuggerAgent(scriptDebugServer, inspectedWorkerGlobalScope, injectedScriptManager));
+    return adoptPtrWillBeNoop(new WorkerDebuggerAgent(scriptDebugServer, inspectedWorkerGlobalScope, injectedScriptManager, taskObserver));
 }
 
-WorkerDebuggerAgent::WorkerDebuggerAgent(WorkerScriptDebugServer* scriptDebugServer, WorkerGlobalScope* inspectedWorkerGlobalScope, InjectedScriptManager* injectedScriptManager)
+WorkerDebuggerAgent::WorkerDebuggerAgent(WorkerScriptDebugServer* scriptDebugServer, WorkerGlobalScope* inspectedWorkerGlobalScope, InjectedScriptManager* injectedScriptManager, WebThread::TaskObserver* taskObserver)
     : InspectorDebuggerAgent(injectedScriptManager, scriptDebugServer->scriptDebugServer()->isolate())
     , m_scriptDebugServer(scriptDebugServer)
     , m_inspectedWorkerGlobalScope(inspectedWorkerGlobalScope)
+    , m_taskObserver(taskObserver)
 {
 }
 
 WorkerDebuggerAgent::~WorkerDebuggerAgent()
 {
 }
 
 DEFINE_TRACE(WorkerDebuggerAgent)
 {
     visitor->trace(m_inspectedWorkerGlobalScope);
     InspectorDebuggerAgent::trace(visitor);
 }
 
 void WorkerDebuggerAgent::interruptAndDispatchInspectorCommands()
 {
-    scriptDebugServer().interruptAndRun(adoptPtr(new RunInspectorCommandsTask(m_inspectedWorkerGlobalScope->thread())));
+    scriptDebugServer().interruptAndRun(adoptPtr(new RunInspectorCommandsTask(m_inspectedWorkerGlobalScope->thread(), m_taskObserver)));
 }
 
 void WorkerDebuggerAgent::startListeningScriptDebugServer()
 {
     m_scriptDebugServer->addListener(this);
 }
 
 void WorkerDebuggerAgent::stopListeningScriptDebugServer()
 {
     m_scriptDebugServer->removeListener(this);
@@ skipping 19 matching lines @@
 {
     // We don't need to mute console for workers.
 }
 
 void WorkerDebuggerAgent::unmuteConsole()
 {
     // We don't need to mute console for workers.
 }
 
 } // namespace blink