Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (98094 => 98095)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-10-21 12:02:58 UTC (rev 98094)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-10-21 12:39:08 UTC (rev 98095)
@@ -1,3 +1,22 @@
+2011-10-21 Yury Semikhatsky <yu...@chromium.org>
+
+ [Chromium] Web Inspector: remove debugger support for out-of-process dedicated workers
+ https://bugs.webkit.org/show_bug.cgi?id=70602
+
+ Now that Chromium uses in-process dedicated workers, remove support for out-of-process
+ dedicated workers debugger.
+
+ Reviewed by Pavel Feldman.
+
+ * public/WebWorker.h:
+ * src/WebWorkerClientImpl.cpp:
+ (WebKit::WebWorkerClientImpl::connectToInspector):
+ (WebKit::WebWorkerClientImpl::disconnectFromInspector):
+ (WebKit::WebWorkerClientImpl::WebWorkerClientImpl):
+ * src/WebWorkerClientImpl.h:
+ * src/WebWorkerImpl.cpp:
+ * src/WebWorkerImpl.h:
+
2011-10-20 Sheriff Bot <webkit.review....@gmail.com>
Unreviewed. Rolled DEPS.
Modified: trunk/Source/WebKit/chromium/public/WebWorker.h (98094 => 98095)
--- trunk/Source/WebKit/chromium/public/WebWorker.h 2011-10-21 12:02:58 UTC (rev 98094)
+++ trunk/Source/WebKit/chromium/public/WebWorker.h 2011-10-21 12:39:08 UTC (rev 98095)
@@ -55,10 +55,6 @@
const WebMessagePortChannelArray&) = 0;
virtual void workerObjectDestroyed() = 0;
virtual void clientDestroyed() = 0;
-
- virtual void attachDevTools() { }
- virtual void detachDevTools() { }
- virtual void dispatchDevToolsMessage(const WebString&) { }
};
} // namespace WebKit
Modified: trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp (98094 => 98095)
--- trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp 2011-10-21 12:02:58 UTC (rev 98094)
+++ trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.cpp 2011-10-21 12:39:08 UTC (rev 98095)
@@ -118,13 +118,10 @@
void WebWorkerClientImpl::connectToInspector(PageInspector* inspector)
{
m_proxy->connectToInspector(inspector);
- ASSERT(!m_pageInspector);
- m_pageInspector = inspector;
}
void WebWorkerClientImpl::disconnectFromInspector()
{
- m_pageInspector = 0;
m_proxy->disconnectFromInspector();
}
@@ -212,12 +209,6 @@
return !webView->permissionClient() || webView->permissionClient()->allowDatabase(m_webFrame, name, displayName, estimatedSize);
}
-void WebWorkerClientImpl::dispatchDevToolsMessage(const WebString& message)
-{
- if (m_pageInspector)
- m_pageInspector->dispatchMessageFromWorker(message);
-}
-
WebView* WebWorkerClientImpl::view() const
{
return m_webFrame->view();
@@ -227,8 +218,6 @@
: m_proxy(new WorkerMessagingProxy(worker))
, m_scriptExecutionContext(worker->scriptExecutionContext())
, m_webFrame(webFrame)
- , m_pageInspector(0)
-
{
}
Modified: trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.h (98094 => 98095)
--- trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.h 2011-10-21 12:02:58 UTC (rev 98094)
+++ trunk/Source/WebKit/chromium/src/WebWorkerClientImpl.h 2011-10-21 12:39:08 UTC (rev 98095)
@@ -105,8 +105,6 @@
virtual void openFileSystem(WebFileSystem::Type, long long size, bool create,
WebFileSystemCallbacks*);
- virtual void dispatchDevToolsMessage(const WebString&);
-
// WebCommentWorkerBase methods:
virtual NewWebCommonWorkerClient* newCommonClient() { return this; }
virtual WebView* view() const;
@@ -119,7 +117,6 @@
// Guard against context from being destroyed before a worker exits.
RefPtr<WebCore::ScriptExecutionContext> m_scriptExecutionContext;
WebFrameImpl* m_webFrame;
- WebCore::WorkerContextProxy::PageInspector* m_pageInspector;
};
} // namespace WebKit;
Modified: trunk/Source/WebKit/chromium/src/WebWorkerImpl.cpp (98094 => 98095)
--- trunk/Source/WebKit/chromium/src/WebWorkerImpl.cpp 2011-10-21 12:02:58 UTC (rev 98094)
+++ trunk/Source/WebKit/chromium/src/WebWorkerImpl.cpp 2011-10-21 12:39:08 UTC (rev 98095)
@@ -42,8 +42,6 @@
#include "SecurityOrigin.h"
#include "SerializedScriptValue.h"
#include "SubstituteData.h"
-#include "WorkerDebuggerAgent.h"
-#include "WorkerInspectorController.h"
#include <wtf/OwnPtr.h>
#include <wtf/Threading.h>
@@ -153,39 +151,6 @@
m_client = 0;
}
-static void connectToWorkerContextInspectorTask(ScriptExecutionContext* context, bool)
-{
- ASSERT(context->isWorkerContext());
- static_cast<WorkerContext*>(context)->workerInspectorController()->connectFrontend();
-}
-
-void WebWorkerImpl::attachDevTools()
-{
- workerThread()->runLoop().postTask(createCallbackTask(connectToWorkerContextInspectorTask, true));
-}
-
-static void disconnectFromWorkerContextInspectorTask(ScriptExecutionContext* context, bool)
-{
- ASSERT(context->isWorkerContext());
- static_cast<WorkerContext*>(context)->workerInspectorController()->disconnectFrontend();
-}
-
-void WebWorkerImpl::detachDevTools()
-{
- workerThread()->runLoop().postTaskForMode(createCallbackTask(disconnectFromWorkerContextInspectorTask, true), WorkerDebuggerAgent::debuggerTaskMode);
-}
-
-static void dispatchOnInspectorBackendTask(ScriptExecutionContext* context, const String& message)
-{
- ASSERT(context->isWorkerContext());
- static_cast<WorkerContext*>(context)->workerInspectorController()->dispatchMessageFromFrontend(message);
-}
-
-void WebWorkerImpl::dispatchDevToolsMessage(const WebString& message)
-{
- workerThread()->runLoop().postTaskForMode(createCallbackTask(dispatchOnInspectorBackendTask, String(message)), WorkerDebuggerAgent::debuggerTaskMode);
-}
-
#else
WebWorker* WebWorker::create(WebWorkerClient* client)
Modified: trunk/Source/WebKit/chromium/src/WebWorkerImpl.h (98094 => 98095)
--- trunk/Source/WebKit/chromium/src/WebWorkerImpl.h 2011-10-21 12:02:58 UTC (rev 98094)
+++ trunk/Source/WebKit/chromium/src/WebWorkerImpl.h 2011-10-21 12:39:08 UTC (rev 98095)
@@ -57,10 +57,6 @@
virtual void workerObjectDestroyed();
virtual void clientDestroyed();
- virtual void attachDevTools();
- virtual void detachDevTools();
- virtual void dispatchDevToolsMessage(const WebKit::WebString&);
-
// WebWorkerBase methods:
virtual WebWorkerClient* client() { return m_client; }
virtual WebCommonWorkerClient* commonClient();
