Changeset 90398 in webkit

Timestamp:

Jul 5, 2011 9:01:45 AM (13 years ago)

Author:

yurys@chromium.org

Message:

2011-07-05 Yury Semikhatsky <​yurys@chromium.org>

[Chromium] Web Inspector: extend WebSharedWorker with inspector transport methods
​https://bugs.webkit.org/show_bug.cgi?id=63942

Added methods for connecting inspector to shared worker and for passing
messages between shared worker inspector and corresponding inspector frontend.

Reviewed by Pavel Feldman.

• public/WebCommonWorkerClient.h: (WebKit::WebCommonWorkerClient::dispatchDevToolsMessage):
• public/WebSharedWorker.h: (WebKit::WebSharedWorker::attachDevTools): (WebKit::WebSharedWorker::detachDevTools): (WebKit::WebSharedWorker::dispatchDevToolsMessage):
• public/WebWorkerClient.h:
• src/WebSharedWorkerImpl.cpp: (WebKit::connectToWorkerContextInspectorTask): (WebKit::WebSharedWorkerImpl::attachDevTools): (WebKit::disconnectFromWorkerContextInspectorTask): (WebKit::WebSharedWorkerImpl::detachDevTools): (WebKit::dispatchOnInspectorBackendTask): (WebKit::WebSharedWorkerImpl::dispatchDevToolsMessage):
• src/WebSharedWorkerImpl.h:
• src/WebWorkerBase.cpp: (WebKit::WebWorkerBase::postMessageToPageInspectorTask):

Location:

trunk/Source/WebKit/chromium

Files:

• ChangeLog (modified) (1 diff)
• public/WebCommonWorkerClient.h (modified) (1 diff)
• public/WebSharedWorker.h (modified) (1 diff)
• public/WebWorkerClient.h (modified) (1 diff)
• src/WebSharedWorkerImpl.cpp (modified) (2 diffs)
• src/WebSharedWorkerImpl.h (modified) (1 diff)
• src/WebWorkerBase.cpp (modified) (1 diff)

trunk/Source/WebKit/chromium/ChangeLog

@@ +1 @@
+2011-07-05  Yury Semikhatsky  <yurys@chromium.org>
+
+        [Chromium] Web Inspector: extend WebSharedWorker with inspector transport methods
+        https://bugs.webkit.org/show_bug.cgi?id=63942
+
+        Added methods for connecting inspector to shared worker and for passing
+        messages between shared worker inspector and corresponding inspector frontend.
+
+        Reviewed by Pavel Feldman.
+
+        * public/WebCommonWorkerClient.h:
+        (WebKit::WebCommonWorkerClient::dispatchDevToolsMessage):
+        * public/WebSharedWorker.h:
+        (WebKit::WebSharedWorker::attachDevTools):
+        (WebKit::WebSharedWorker::detachDevTools):
+        (WebKit::WebSharedWorker::dispatchDevToolsMessage):
+        * public/WebWorkerClient.h:
+        * src/WebSharedWorkerImpl.cpp:
+        (WebKit::connectToWorkerContextInspectorTask):
+        (WebKit::WebSharedWorkerImpl::attachDevTools):
+        (WebKit::disconnectFromWorkerContextInspectorTask):
+        (WebKit::WebSharedWorkerImpl::detachDevTools):
+        (WebKit::dispatchOnInspectorBackendTask):
+        (WebKit::WebSharedWorkerImpl::dispatchDevToolsMessage):
+        * src/WebSharedWorkerImpl.h:
+        * src/WebWorkerBase.cpp:
+        (WebKit::WebWorkerBase::postMessageToPageInspectorTask):
+
 2011-07-01  Kent Tamura  <tkent@chromium.org>
 

trunk/Source/WebKit/chromium/public/WebCommonWorkerClient.h

@@ -99 +99 @@
     }
 
+    virtual void dispatchDevToolsMessage(const WebString&) { }
+
 protected:
     ~WebCommonWorkerClient() { }

trunk/Source/WebKit/chromium/public/WebSharedWorker.h

@@ -78 +78 @@
     // Notification when the WebCommonWorkerClient is destroyed.
     virtual void clientDestroyed() = 0;
+
+    virtual void attachDevTools() { }
+    virtual void detachDevTools() { }
+    virtual void dispatchDevToolsMessage(const WebString&) { }
 };
 

trunk/Source/WebKit/chromium/public/WebWorkerClient.h

@@ -53 +53 @@
     virtual void reportPendingActivity(bool hasPendingActivity) = 0;
 
-    virtual void dispatchDevToolsMessage(const WebString&) { }
-
 protected:
     ~WebWorkerClient() { }

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

@@ -40 +40 @@
 #include "SharedWorkerContext.h"
 #include "SharedWorkerThread.h"
+#include "WorkerInspectorController.h"
+#include "WorkerScriptDebugServer.h"
 
 #include "WebMessagePortChannel.h"
@@ -110 +112 @@
 }
 
+static void connectToWorkerContextInspectorTask(ScriptExecutionContext* context, bool)
+{
+    ASSERT(context->isWorkerContext());
+    static_cast<WorkerContext*>(context)->workerInspectorController()->connectFrontend();
+}
+
+void WebSharedWorkerImpl::attachDevTools()
+{
+    workerThread()->runLoop().postTask(createCallbackTask(connectToWorkerContextInspectorTask, true));
+}
+
+static void disconnectFromWorkerContextInspectorTask(ScriptExecutionContext* context, bool)
+{
+    ASSERT(context->isWorkerContext());
+    static_cast<WorkerContext*>(context)->workerInspectorController()->disconnectFrontend();
+}
+
+void WebSharedWorkerImpl::detachDevTools()
+{
+    workerThread()->runLoop().postTaskForMode(createCallbackTask(disconnectFromWorkerContextInspectorTask, true), WorkerScriptDebugServer::debuggerTaskMode);
+}
+
+static void dispatchOnInspectorBackendTask(ScriptExecutionContext* context, const String& message)
+{
+    ASSERT(context->isWorkerContext());
+    static_cast<WorkerContext*>(context)->workerInspectorController()->dispatchMessageFromFrontend(message);
+}
+
+void WebSharedWorkerImpl::dispatchDevToolsMessage(const WebString& message)
+{
+    workerThread()->runLoop().postTaskForMode(createCallbackTask(dispatchOnInspectorBackendTask, String(message)), WorkerScriptDebugServer::debuggerTaskMode);
+}
+
 WebWorkerClient* WebSharedWorkerImpl::client()
 {

trunk/Source/WebKit/chromium/src/WebSharedWorkerImpl.h

@@ -57 +57 @@
     virtual void clientDestroyed();
 
+    virtual void attachDevTools();
+    virtual void detachDevTools();
+    virtual void dispatchDevToolsMessage(const WebString&);
+
     // WebWorkerBase methods:
     WebWorkerClient* client();

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

@@ -430 +430 @@
 void WebWorkerBase::postMessageToPageInspectorTask(ScriptExecutionContext*, WebWorkerBase* thisPtr, const String& message)
 {
-    if (!thisPtr->client())
-        return;
-    thisPtr->client()->dispatchDevToolsMessage(message);
+    if (!thisPtr->commonClient())
+        return;
+    thisPtr->commonClient()->dispatchDevToolsMessage(message);
 }