Index: content/renderer/webworker_proxy.cc |
diff --git a/content/renderer/webworker_proxy.cc b/content/renderer/webworker_proxy.cc |
index 9817f0fab730d5ae8f0767da3008a45291aa229b..1457be7f8d3a953116aa5edc5a064116cfe88f5c 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,25 @@ void WebWorkerProxy::workerObjectDestroyed() { |
void WebWorkerProxy::clientDestroyed() { |
} |
+void WebWorkerProxy::attachDevTools() { |
+ devtools_proxy_->AttachDevTools(); |
+} |
+ |
+void WebWorkerProxy::detachDevTools() { |
+ devtools_proxy_->DetachDevTools(); |
+} |
+ |
+void WebWorkerProxy::dispatchDevToolsMessage(const WebString& message) { |
+ devtools_proxy_->SendDevToolsMessage(message.utf8()); |
+} |
+ |
bool WebWorkerProxy::OnMessageReceived(const IPC::Message& message) { |
if (!client_) |
return false; |
+ if (devtools_proxy_->OnMessageReceived(message)) |
+ return true; |
+ |
bool handled = true; |
IPC_BEGIN_MESSAGE_MAP(WebWorkerProxy, message) |
IPC_MESSAGE_HANDLER(ViewMsg_WorkerCreated, OnWorkerCreated) |