Do not expose InspectorTaskRunner from WorkerThread.

BUG=none Review URL: https://codereview.chromium.org/1765043002 Cr-Commit-Position: refs/heads/master@{#379380}
marcosholgado · Mar 4, 2016 · 8e34a51 · 8e34a51
1 parent 26920e9
commit 8e34a51
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 11 deletions.
diff --git a/third_party/WebKit/Source/core/inspector/WorkerInspectorController.cpp b/third_party/WebKit/Source/core/inspector/WorkerInspectorController.cpp
@@ -92,7 +92,6 @@ WorkerInspectorController::~WorkerInspectorController()
 void WorkerInspectorController::connectFrontend()
 {
     ASSERT(!m_frontend);
-    InspectorTaskRunner::IgnoreInterruptsScope scope(m_workerGlobalScope->thread()->inspectorTaskRunner());
     m_frontend = adoptPtr(new protocol::Frontend(this));
     m_backendDispatcher = protocol::Dispatcher::create(this);
     m_agents.registerInDispatcher(m_backendDispatcher.get());
@@ -104,7 +103,6 @@ void WorkerInspectorController::disconnectFrontend()
 {
     if (!m_frontend)
         return;
-    InspectorTaskRunner::IgnoreInterruptsScope scope(m_workerGlobalScope->thread()->inspectorTaskRunner());
     m_backendDispatcher->clearFrontend();
     m_backendDispatcher.clear();
     m_agents.clearFrontend();
@@ -114,7 +112,6 @@ void WorkerInspectorController::disconnectFrontend()
 
 void WorkerInspectorController::dispatchMessageFromFrontend(const String& message)
 {
-    InspectorTaskRunner::IgnoreInterruptsScope scope(m_workerGlobalScope->thread()->inspectorTaskRunner());
     if (m_backendDispatcher) {
         // sessionId will be overwritten by WebDevToolsAgent::sendProtocolNotifications call.
         m_backendDispatcher->dispatch(0, message);

diff --git a/third_party/WebKit/Source/core/workers/WorkerThread.cpp b/third_party/WebKit/Source/core/workers/WorkerThread.cpp
@@ -385,11 +385,6 @@ WorkerGlobalScope* WorkerThread::workerGlobalScope()
     return m_workerGlobalScope.get();
 }
 
-InspectorTaskRunner* WorkerThread::inspectorTaskRunner()
-{
-    return m_inspectorTaskRunner.get();
-}
-
 bool WorkerThread::terminated()
 {
     MutexLocker lock(m_threadStateMutex);
@@ -554,6 +549,7 @@ WorkerThread::TaskQueueResult WorkerThread::runDebuggerTask(WaitMode waitMode)
     }
 
     if (result == TaskReceived) {
+        InspectorTaskRunner::IgnoreInterruptsScope scope(m_inspectorTaskRunner.get());
         {
             MutexLocker lock(m_threadStateMutex);
             m_runningDebuggerTask = true;

diff --git a/third_party/WebKit/Source/core/workers/WorkerThread.h b/third_party/WebKit/Source/core/workers/WorkerThread.h
@@ -106,9 +106,6 @@ class CORE_EXPORT WorkerThread {
     // Can be called only on the worker thread, WorkerGlobalScope is not thread safe.
     WorkerGlobalScope* workerGlobalScope();
 
-    // Can be called on any thread.
-    InspectorTaskRunner* inspectorTaskRunner();
-
     // Returns true once one of the terminate* methods is called.
     bool terminated();