Changeset 88235 in webkit

Timestamp:

Jun 7, 2011 7:27:02 AM (13 years ago)

Author:

yurys@chromium.org

Message:

2011-06-03 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

[Chromium] Web Inspector: correctly handle disconnect from worker when script execution is paused
​https://bugs.webkit.org/show_bug.cgi?id=62019

Dispatch disconnecFrontend message in debugger task mode to make sure
it is processed even if execution is paused.

• bindings/v8/WorkerScriptDebugServer.cpp: (WebCore::WorkerScriptDebugServer::runMessageLoopOnPause): (WebCore::WorkerScriptDebugServer::quitMessageLoopOnPause):
• bindings/v8/WorkerScriptDebugServer.h:

2011-06-03 Yury Semikhatsky <​yurys@chromium.org>

Reviewed by Pavel Feldman.

[Chromium] Web Inspector: correctly handle disconnect from worker when script execution is paused
​https://bugs.webkit.org/show_bug.cgi?id=62019

Dispatch disconnecFrontend message in debugger task mode to make sure
it is processed even if execution is paused.

• src/WebWorkerImpl.cpp: (WebKit::WebWorkerImpl::detachDevTools): (WebKit::WebWorkerImpl::dispatchDevToolsMessage):

Location:

trunk/Source

Files:

• WebCore/ChangeLog (modified) (1 diff)
• WebCore/bindings/v8/WorkerScriptDebugServer.cpp (modified) (3 diffs)
• WebCore/bindings/v8/WorkerScriptDebugServer.h (modified) (1 diff)
• WebKit/chromium/ChangeLog (modified) (1 diff)
• WebKit/chromium/src/WebWorkerImpl.cpp (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-06-03  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        [Chromium] Web Inspector: correctly handle disconnect from worker when script execution is paused
+        https://bugs.webkit.org/show_bug.cgi?id=62019
+
+        Dispatch disconnecFrontend message in debugger task mode to make sure
+        it is processed even if execution is paused.
+
+        * bindings/v8/WorkerScriptDebugServer.cpp:
+        (WebCore::WorkerScriptDebugServer::runMessageLoopOnPause):
+        (WebCore::WorkerScriptDebugServer::quitMessageLoopOnPause):
+        * bindings/v8/WorkerScriptDebugServer.h:
+
 2011-06-07  Felician Marton  <marton.felician.zoltan@stud.u-szeged.hu>
 

trunk/Source/WebCore/bindings/v8/WorkerScriptDebugServer.cpp

@@ -65 +65 @@
     return 0;
 }
+
+const char* WorkerScriptDebugServer::debuggerTaskMode = "debugger";
 
 WorkerScriptDebugServer::WorkerScriptDebugServer()
@@ -133 +135 @@
     MessageQueueWaitResult result;
     do {
-        result = workerThread->runLoop().runInMode(workerContext, "debugger");
+        result = workerThread->runLoop().runInMode(workerContext, debuggerTaskMode);
     // Keep waiting until execution is resumed.
     } while (result == MessageQueueMessageReceived && isPaused());
@@ -145 +147 @@
 void WorkerScriptDebugServer::quitMessageLoopOnPause()
 {
-    // FIXME: do exit nested loop when listener is removed on pause.
+    // Nothing to do here in case of workers since runMessageLoopOnPause will check for paused state after each debugger command.
 }
 

trunk/Source/WebCore/bindings/v8/WorkerScriptDebugServer.h

@@ -49 +49 @@
     void removeListener(ScriptDebugListener*, WorkerContext*);
 
+    static const char* debuggerTaskMode;
+
 private:
     virtual ScriptDebugListener* getDebugListenerForContext(v8::Handle<v8::Context>);

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-06-03  Yury Semikhatsky  <yurys@chromium.org>
+
+        Reviewed by Pavel Feldman.
+
+        [Chromium] Web Inspector: correctly handle disconnect from worker when script execution is paused
+        https://bugs.webkit.org/show_bug.cgi?id=62019
+
+        Dispatch disconnecFrontend message in debugger task mode to make sure
+        it is processed even if execution is paused.
+
+        * src/WebWorkerImpl.cpp:
+        (WebKit::WebWorkerImpl::detachDevTools):
+        (WebKit::WebWorkerImpl::dispatchDevToolsMessage):
+
 2011-06-07  Naoki Takano  <takano.naoki@gmail.com>
 

trunk/Source/WebKit/chromium/src/WebWorkerImpl.cpp

@@ -44 +44 @@
 #include "SubstituteData.h"
 #include "WorkerInspectorController.h"
+#include "WorkerScriptDebugServer.h"
 #include <wtf/OwnPtr.h>
 #include <wtf/Threading.h>
@@ -167 +168 @@
 void WebWorkerImpl::detachDevTools()
 {
-    workerThread()->runLoop().postTask(createCallbackTask(disconnectFromWorkerContextInspectorTask, true));
+    workerThread()->runLoop().postTaskForMode(createCallbackTask(disconnectFromWorkerContextInspectorTask, true), WorkerScriptDebugServer::debuggerTaskMode);
 }
 
@@ -178 +179 @@
 void WebWorkerImpl::dispatchDevToolsMessage(const WebString& message)
 {
-    workerThread()->runLoop().postTaskForMode(createCallbackTask(dispatchOnInspectorBackendTask, String(message)), "debugger");
+    workerThread()->runLoop().postTaskForMode(createCallbackTask(dispatchOnInspectorBackendTask, String(message)), WorkerScriptDebugServer::debuggerTaskMode);
 }