Index: content/renderer/service_worker/embedded_worker_dispatcher.cc |
diff --git a/content/renderer/service_worker/embedded_worker_dispatcher.cc b/content/renderer/service_worker/embedded_worker_dispatcher.cc |
index 82a3d339cb806ed733d9d21d139733708cf7ed02..6ae6cec5a47158441650a1f378871904c6301968 100644 |
--- a/content/renderer/service_worker/embedded_worker_dispatcher.cc |
+++ b/content/renderer/service_worker/embedded_worker_dispatcher.cc |
@@ -11,6 +11,7 @@ |
#include "content/child/scoped_child_process_reference.h" |
#include "content/child/thread_safe_sender.h" |
#include "content/child/worker_task_runner.h" |
+#include "content/common/devtools_messages.h" |
#include "content/common/service_worker/embedded_worker_messages.h" |
#include "content/public/common/content_client.h" |
#include "content/renderer/render_thread_impl.h" |
@@ -30,12 +31,54 @@ class EmbeddedWorkerDispatcher::WorkerWrapper { |
~WorkerWrapper() {} |
blink::WebEmbeddedWorker* worker() { return worker_.get(); } |
+ void OnMessageReceived(const IPC::Message& message); |
private: |
+ void OnAttachDevTools(); |
+ void OnReattachDevTools(const std::string& state); |
+ void OnDetachDevTools(); |
+ void OnDispatchOnInspectorBackend(const std::string& message); |
+ void OnResumeWorkerContext(); |
+ |
ScopedChildProcessReference process_ref_; |
scoped_ptr<blink::WebEmbeddedWorker> worker_; |
}; |
+void EmbeddedWorkerDispatcher::WorkerWrapper::OnMessageReceived( |
+ const IPC::Message& message) { |
+ IPC_BEGIN_MESSAGE_MAP(WorkerWrapper, message) |
+ IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Attach, OnAttachDevTools) |
+ IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Reattach, OnReattachDevTools) |
+ IPC_MESSAGE_HANDLER(DevToolsAgentMsg_Detach, OnDetachDevTools) |
+ IPC_MESSAGE_HANDLER(DevToolsAgentMsg_DispatchOnInspectorBackend, |
+ OnDispatchOnInspectorBackend) |
+ IPC_MESSAGE_HANDLER(DevToolsAgentMsg_ResumeWorkerContext, |
+ OnResumeWorkerContext) |
+ IPC_END_MESSAGE_MAP() |
+} |
+ |
+void EmbeddedWorkerDispatcher::WorkerWrapper::OnAttachDevTools() { |
+ worker_->attachDevTools(); |
+} |
+ |
+void EmbeddedWorkerDispatcher::WorkerWrapper::OnReattachDevTools( |
+ const std::string& state) { |
+ worker_->reattachDevTools(blink::WebString::fromUTF8(state)); |
+} |
+ |
+void EmbeddedWorkerDispatcher::WorkerWrapper::OnDetachDevTools() { |
+ worker_->detachDevTools(); |
+} |
+ |
+void EmbeddedWorkerDispatcher::WorkerWrapper::OnDispatchOnInspectorBackend( |
+ const std::string& message) { |
+ worker_->dispatchDevToolsMessage(blink::WebString::fromUTF8(message)); |
+} |
+ |
+void EmbeddedWorkerDispatcher::WorkerWrapper::OnResumeWorkerContext() { |
+ worker_->resumeWorkerContext(); |
+} |
+ |
EmbeddedWorkerDispatcher::EmbeddedWorkerDispatcher() : weak_factory_(this) {} |
EmbeddedWorkerDispatcher::~EmbeddedWorkerDispatcher() {} |
@@ -46,6 +89,8 @@ bool EmbeddedWorkerDispatcher::OnMessageReceived( |
IPC_BEGIN_MESSAGE_MAP(EmbeddedWorkerDispatcher, message) |
IPC_MESSAGE_HANDLER(EmbeddedWorkerMsg_StartWorker, OnStartWorker) |
IPC_MESSAGE_HANDLER(EmbeddedWorkerMsg_StopWorker, OnStopWorker) |
+ IPC_MESSAGE_HANDLER(EmbeddedWorkerMsg_MessageToWorker, |
+ OnMessageToWorker) |
IPC_MESSAGE_UNHANDLED(handled = false) |
IPC_END_MESSAGE_MAP() |
return handled; |
@@ -94,4 +139,15 @@ void EmbeddedWorkerDispatcher::OnStopWorker(int embedded_worker_id) { |
wrapper->worker()->terminateWorkerContext(); |
} |
+void EmbeddedWorkerDispatcher::OnMessageToWorker( |
+ int embedded_worker_id, |
+ const IPC::Message& message) { |
+ WorkerWrapper* wrapper = workers_.Lookup(embedded_worker_id); |
+ if (!wrapper) { |
+ LOG(WARNING) << "Got OnMessageToWorker for nonexistent worker"; |
+ return; |
+ } |
+ wrapper->OnMessageReceived(message); |
+} |
+ |
} // namespace content |