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

Source/core/inspector/WorkerInspectorController.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 84 matching lines @@
 
     ~WorkerInjectedScriptHostClient() override { }
 };
 
 WorkerInspectorController::WorkerInspectorController(WorkerGlobalScope* workerGlobalScope)
     : m_workerGlobalScope(workerGlobalScope)
     , m_stateClient(adoptPtr(new WorkerStateClient(workerGlobalScope)))
     , m_state(adoptPtrWillBeNoop(new InspectorCompositeState(m_stateClient.get())))
     , m_instrumentingAgents(InstrumentingAgents::create())
     , m_injectedScriptManager(InjectedScriptManager::createForWorker())
-    , m_debugServer(WorkerScriptDebugServer::create(workerGlobalScope))
+    , m_debugServer(WorkerScriptDebugServer::create(this, workerGlobalScope))
     , m_agents(m_instrumentingAgents.get(), m_state.get())
     , m_paused(false)
 {
     OwnPtrWillBeRawPtr<WorkerRuntimeAgent> workerRuntimeAgent = WorkerRuntimeAgent::create(m_injectedScriptManager.get(), m_debugServer->scriptDebugServer(), workerGlobalScope, this);
     m_workerRuntimeAgent = workerRuntimeAgent.get();
     m_agents.append(workerRuntimeAgent.release());
 
-    OwnPtrWillBeRawPtr<WorkerDebuggerAgent> workerDebuggerAgent = WorkerDebuggerAgent::create(m_debugServer.get(), workerGlobalScope, m_injectedScriptManager.get());
+    OwnPtrWillBeRawPtr<InspectorProfilerAgent> profilerAgent = InspectorProfilerAgent::create(m_injectedScriptManager.get(), 0);
+    m_profilerAgent = profilerAgent.get();
+    m_agents.append(profilerAgent.release());
+
+    OwnPtrWillBeRawPtr<WorkerDebuggerAgent> workerDebuggerAgent = WorkerDebuggerAgent::create(m_debugServer.get(), workerGlobalScope, m_injectedScriptManager.get(), this);
     m_workerDebuggerAgent = workerDebuggerAgent.get();
     m_agents.append(workerDebuggerAgent.release());
     m_asyncCallTracker = adoptPtrWillBeNoop(new AsyncCallTracker(m_workerDebuggerAgent, m_instrumentingAgents.get()));
 
-    m_agents.append(InspectorProfilerAgent::create(m_injectedScriptManager.get(), 0));
     m_agents.append(InspectorHeapProfilerAgent::create(m_injectedScriptManager.get()));
 
     OwnPtrWillBeRawPtr<WorkerConsoleAgent> workerConsoleAgent = WorkerConsoleAgent::create(m_injectedScriptManager.get(), workerGlobalScope);
     WorkerConsoleAgent* workerConsoleAgentPtr = workerConsoleAgent.get();
     m_agents.append(workerConsoleAgent.release());
 
     m_agents.append(InspectorTimelineAgent::create());
 
     m_injectedScriptManager->injectedScriptHost()->init(workerConsoleAgentPtr, m_workerDebuggerAgent, nullptr, m_debugServer->scriptDebugServer(), adoptPtr(new WorkerInjectedScriptHostClient()));
 }
@@ skipping 67 matching lines @@
 
 bool WorkerInspectorController::isRunRequired()
 {
     return m_paused;
 }
 
 void WorkerInspectorController::pauseOnStart()
 {
     m_paused = true;
     MessageQueueWaitResult result;
-    m_workerGlobalScope->thread()->willEnterNestedLoop();
+    willProcessTask();
     do {
         result = m_workerGlobalScope->thread()->runDebuggerTask();
     // Keep waiting until execution is resumed.
     } while (result == MessageQueueMessageReceived && m_paused);
-    m_workerGlobalScope->thread()->didLeaveNestedLoop();
+    didProcessTask();
+}
+
+void WorkerInspectorController::willProcessTask()
+{
+    m_profilerAgent->willProcessTask();
+}
+
+void WorkerInspectorController::didProcessTask()
+{
+    m_profilerAgent->didProcessTask();
 }
 
 DEFINE_TRACE(WorkerInspectorController)
 {
     visitor->trace(m_workerGlobalScope);
     visitor->trace(m_state);
     visitor->trace(m_instrumentingAgents);
     visitor->trace(m_injectedScriptManager);
     visitor->trace(m_debugServer);
     visitor->trace(m_backendDispatcher);
     visitor->trace(m_agents);
+    visitor->trace(m_profilerAgent);
     visitor->trace(m_workerDebuggerAgent);
     visitor->trace(m_asyncCallTracker);
     visitor->trace(m_workerRuntimeAgent);
 }
 
 } // namespace blink