[worklets] Change WorkerInspectorController to accept a WorkerThread.

third_party/WebKit/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 16 matching lines @@
  * (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 "core/inspector/WorkerInspectorController.h"
 
 #include "core/InstrumentingAgents.h"
 #include "core/inspector/InspectorInstrumentation.h"
 #include "core/inspector/InspectorLogAgent.h"
 #include "core/inspector/WorkerThreadDebugger.h"
 #include "core/workers/WorkerGlobalScope.h"

[nhiroki, 2016/07/27 07:12:05]

Maybe WorkerGlobalScope.h is not necessary.

[ikilpatrick, 2016/07/27 17:50:41]

Done.

 #include "core/workers/WorkerReportingProxy.h"
 #include "core/workers/WorkerThread.h"
 #include "platform/inspector_protocol/DispatcherBase.h"
 #include "platform/v8_inspector/public/V8Debugger.h"
 #include "platform/v8_inspector/public/V8InspectorSession.h"
 
 namespace blink {
 
-WorkerInspectorController* WorkerInspectorController::create(WorkerGlobalScope* workerGlobalScope)
+WorkerInspectorController* WorkerInspectorController::create(WorkerThread* thread)
 {
-    WorkerThreadDebugger* debugger = WorkerThreadDebugger::from(workerGlobalScope->thread()->isolate());
-    return debugger ? new WorkerInspectorController(workerGlobalScope, debugger) : nullptr;
+    WorkerThreadDebugger* debugger = WorkerThreadDebugger::from(thread->isolate());
+    return debugger ? new WorkerInspectorController(thread, debugger) : nullptr;
 }
 
-WorkerInspectorController::WorkerInspectorController(WorkerGlobalScope* workerGlobalScope, WorkerThreadDebugger* debugger)
+WorkerInspectorController::WorkerInspectorController(WorkerThread* thread, WorkerThreadDebugger* debugger)
     : m_debugger(debugger)
-    , m_workerGlobalScope(workerGlobalScope)
+    , m_thread(thread)
     , m_instrumentingAgents(new InstrumentingAgents())
     , m_logAgent(nullptr)
 {
 }
 
 WorkerInspectorController::~WorkerInspectorController()
 {

[yhirano, 2016/07/27 08:57:06]

DCHECK(!m_thread);

[ikilpatrick, 2016/07/27 17:50:41]

Done.

 }
 
 void WorkerInspectorController::connectFrontend()
 {
     if (m_session)
         return;
 
     // sessionId will be overwritten by WebDevToolsAgent::sendProtocolNotification call.
     m_session = new InspectorSession(this, nullptr, m_instrumentingAgents.get(), 0, true /* autoFlush */, m_debugger->debugger(), m_debugger->contextGroupId(), nullptr);
-    m_logAgent = new InspectorLogAgent(m_workerGlobalScope->consoleMessageStorage());
+    m_logAgent = new InspectorLogAgent(m_thread->consoleMessageStorage());

[dgozman, 2016/07/27 01:47:52]

Does this work?

[ikilpatrick, 2016/07/27 17:50:41]

Yup, WorkerThread has a consoleMessageStorage method which sends to it's
globalScope.

     m_session->append(m_logAgent.get());
 }
 
 void WorkerInspectorController::disconnectFrontend()
 {
     if (!m_session)
         return;
     m_session->dispose();
     m_session.clear();
 }
 
 void WorkerInspectorController::dispatchMessageFromFrontend(const String& message)
 {
     if (!m_session)
         return;
     protocol::String16 method;
     if (!protocol::DispatcherBase::getCommandName(message, &method))
         return;
     m_session->dispatchProtocolMessage(method, message);
 }
 
 void WorkerInspectorController::dispose()
 {
     disconnectFrontend();
+    m_thread = nullptr;
 }
 
 void WorkerInspectorController::resumeStartup()
 {
-    m_workerGlobalScope->thread()->stopRunningDebuggerTasksOnPauseOnWorkerThread();
+    m_thread->stopRunningDebuggerTasksOnPauseOnWorkerThread();
 }
 
 void WorkerInspectorController::sendProtocolMessage(int sessionId, int callId, const String& response, const String& state)
 {
     // Worker messages are wrapped, no need to handle callId or state.
-    m_workerGlobalScope->thread()->workerReportingProxy().postMessageToPageInspector(response);
+    m_thread->workerReportingProxy().postMessageToPageInspector(response);
 }
 
 void WorkerInspectorController::consoleCleared()
 {
     if (m_logAgent)
         m_logAgent->clear(nullptr);
 }
 
 DEFINE_TRACE(WorkerInspectorController)
 {
-    visitor->trace(m_workerGlobalScope);
     visitor->trace(m_instrumentingAgents);
     visitor->trace(m_session);
     visitor->trace(m_logAgent);
 }
 
 } // namespace blink