Oilpan: Prepare moving InspectorController and InspectorAgents to oilpan.

Source/core/workers/WorkerThread.cpp

 /*
  * Copyright (C) 2008 Apple 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:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 12 matching lines @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
  */
 
 #include "config.h"
 
 #include "core/workers/WorkerThread.h"
 
 #include "bindings/v8/ScriptSourceCode.h"
 #include "core/inspector/InspectorInstrumentation.h"
+#include "core/inspector/WorkerDebuggerAgent.h"
+#include "core/inspector/WorkerInspectorController.h"
 #include "core/workers/DedicatedWorkerGlobalScope.h"
 #include "core/workers/WorkerClients.h"
 #include "core/workers/WorkerReportingProxy.h"
 #include "core/workers/WorkerThreadStartupData.h"
 #include "platform/PlatformThreadData.h"
 #include "platform/heap/ThreadState.h"
 #include "platform/weborigin/KURL.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebWaitableEvent.h"
 #include "public/platform/WebWorkerRunLoop.h"
@@ skipping 52 matching lines @@
     m_threadID = createThread(WorkerThread::workerThreadStart, this, "WebCore: Worker");
 
     return m_threadID;
 }
 
 void WorkerThread::workerThreadStart(void* thread)
 {
     static_cast<WorkerThread*>(thread)->workerThread();
 }
 
+void WorkerThread::interruptAndDispatchInspectorCommands()
+{
+    if (m_workerDebuggerAgent)

[yurys, 2014/06/24 08:49:52]

m_workerDebuggerAgent is never initialized as I pointed out above, so this
method does nothing. I believe we will need a test for debug break functionality
when worker is in a tight loop to make sure it works after this change.

Also m_workerDebuggerAgent is modified on the worker thread while
interruptAndDispatchInspectorCommands is called on the main thread so this code
is not thread-safe, e.g. m_workerDebuggerAgent may well become null right after
the check.

[keishi, 2014/06/24 14:53:29]

I added a mutex to WorkerThread so that
WorkerThread::interruptAndDispatchInspectorCommands will not run while the
thread is being shutdown in the worker thread.

I'm not sure how to test this.

[yurys, 2014/06/25 05:51:57]

The simplest way would be to add a layout test based on remote debugging
protocol, see e.g.
LayoutTests/inspector-protocol/debugger/debugger-pause-dedicated-worker.html

[yurys, 2014/06/25 07:50:27]

Never mind, I'm adding a new test for this:
https://codereview.chromium.org/352103002/

+        m_workerDebuggerAgent->interruptAndDispatchInspectorCommands(this);
+}
+
 void WorkerThread::workerThread()
 {
     KURL scriptURL = m_startupData->m_scriptURL;
     String sourceCode = m_startupData->m_sourceCode;
     WorkerThreadStartMode startMode = m_startupData->m_startMode;
-
     {
         MutexLocker lock(m_threadCreationMutex);
         ThreadState::attach();
         m_workerGlobalScope = createWorkerGlobalScope(m_startupData.release());
         m_runLoop.setWorkerGlobalScope(workerGlobalScope());
 
         if (m_runLoop.terminated()) {
             // The worker was terminated before the thread had a chance to run. Since the context didn't exist yet,
             // forbidExecution() couldn't be called from stop().
             m_workerGlobalScope->script()->forbidExecution();
         }
     }
     // The corresponding call to didStopWorkerRunLoop is in
     // ~WorkerScriptController.
     blink::Platform::current()->didStartWorkerRunLoop(blink::WebWorkerRunLoop(&m_runLoop));
 
     // Notify proxy that a new WorkerGlobalScope has been created and started.
     m_workerReportingProxy.workerGlobalScopeStarted(m_workerGlobalScope.get());
 
     WorkerScriptController* script = m_workerGlobalScope->script();
     if (!script->isExecutionForbidden())
         script->initializeContextIfNeeded();
     InspectorInstrumentation::willEvaluateWorkerScript(workerGlobalScope(), startMode);
     script->evaluate(ScriptSourceCode(sourceCode, scriptURL));
 
     runEventLoop();
+    m_workerDebuggerAgent.clear();
 
     // This should be called before we start the shutdown procedure.
     workerReportingProxy().willDestroyWorkerGlobalScope();
 
     ThreadIdentifier threadID = m_threadID;
 
     // The below assignment will destroy the context, which will in turn notify messaging proxy.
     // We cannot let any objects survive past thread exit, because no other thread will run GC or otherwise destroy them.
     // If Oilpan is enabled, we detach of the context/global scope, with the final heap cleanup below sweeping it out.
 #if !ENABLE(OILPAN)
@@ skipping 93 matching lines @@
     }
     m_runLoop.terminate();
 }
 
 bool WorkerThread::isCurrentThread() const
 {
     return m_threadID == currentThread();
 }
 
 } // namespace WebCore