Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(36)

Unified Diff: content/renderer/webworker_proxy.cc

Issue 6990059: DevTools: devtools message plumbing between worker and page processes (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Moved worker devtools login under content/ Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/renderer/webworker_proxy.cc
diff --git a/content/renderer/webworker_proxy.cc b/content/renderer/webworker_proxy.cc
index 9817f0fab730d5ae8f0767da3008a45291aa229b..64794637fbe9d22cf595534b5bfac39f2af9823b 100644
--- a/content/renderer/webworker_proxy.cc
+++ b/content/renderer/webworker_proxy.cc
@@ -5,9 +5,11 @@
#include "content/renderer/webworker_proxy.h"
#include "content/common/child_thread.h"
+#include "content/common/content_client.h"
#include "content/common/view_messages.h"
#include "content/common/webmessageportchannel_impl.h"
#include "content/common/worker_messages.h"
+#include "content/renderer/worker_devtools_agent_proxy.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebURL.h"
#include "third_party/WebKit/Source/WebKit/chromium/public/WebWorkerClient.h"
@@ -23,8 +25,13 @@ WebWorkerProxy::WebWorkerProxy(
ChildThread* child_thread,
int render_view_route_id,
int parent_appcache_host_id)
- : WebWorkerBase(child_thread, 0, MSG_ROUTING_NONE, render_view_route_id,
- parent_appcache_host_id),
+ : WebWorkerBase(
+ child_thread,
+ 0,
+ MSG_ROUTING_NONE,
+ render_view_route_id,
+ parent_appcache_host_id,
+ new WorkerDevToolsAgentProxy(this, MSG_ROUTING_NONE, client)),
client_(client) {
// TODO(atwilson): Change to pass in a real document_id when we support nested
// workers.
@@ -84,10 +91,28 @@ void WebWorkerProxy::workerObjectDestroyed() {
void WebWorkerProxy::clientDestroyed() {
}
+void WebWorkerProxy::attachDevTools()
+{
jam 2011/05/25 17:50:12 nit: brace brackets on previous line
yurys 2011/05/26 09:11:49 Done.
+ devtools_delegate_->AttachDevTools();
+}
+
+void WebWorkerProxy::detachDevTools()
+{
+ devtools_delegate_->DetachDevTools();
+}
+
+void WebWorkerProxy::dispatchDevToolsMessage(const WebString& message)
+{
+ devtools_delegate_->SendDevToolsMessage(message.utf8());
+}
+
bool WebWorkerProxy::OnMessageReceived(const IPC::Message& message) {
if (!client_)
return false;
+ if (devtools_delegate_->OnMessageReceived(message))
+ return true;
+
bool handled = true;
IPC_BEGIN_MESSAGE_MAP(WebWorkerProxy, message)
IPC_MESSAGE_HANDLER(ViewMsg_WorkerCreated, OnWorkerCreated)

Powered by Google App Engine
This is Rietveld 408576698