| Index: content/renderer/service_worker/service_worker_script_context.cc
|
| diff --git a/content/renderer/service_worker/service_worker_script_context.cc b/content/renderer/service_worker/service_worker_script_context.cc
|
| index 28cf0eaad9e44f644bed7c5cf47e71e41196015d..77dc52d8563f2e205e5dceebd168a79d67aecd83 100644
|
| --- a/content/renderer/service_worker/service_worker_script_context.cc
|
| +++ b/content/renderer/service_worker/service_worker_script_context.cc
|
| @@ -5,6 +5,7 @@
|
| #include "content/renderer/service_worker/service_worker_script_context.h"
|
|
|
| #include "base/logging.h"
|
| +#include "content/child/webmessageportchannel_impl.h"
|
| #include "content/common/service_worker/service_worker_messages.h"
|
| #include "content/renderer/service_worker/embedded_worker_context_client.h"
|
| #include "ipc/ipc_message.h"
|
| @@ -31,6 +32,7 @@ void ServiceWorkerScriptContext::OnMessageReceived(
|
| IPC_BEGIN_MESSAGE_MAP(ServiceWorkerScriptContext, message)
|
| IPC_MESSAGE_HANDLER(ServiceWorkerMsg_InstallEvent, OnInstallEvent)
|
| IPC_MESSAGE_HANDLER(ServiceWorkerMsg_FetchEvent, OnFetchEvent)
|
| + IPC_MESSAGE_HANDLER(ServiceWorkerMsg_Message, OnMessage)
|
| IPC_MESSAGE_UNHANDLED(handled = false)
|
| IPC_END_MESSAGE_MAP()
|
| DCHECK(handled);
|
| @@ -64,4 +66,22 @@ void ServiceWorkerScriptContext::OnFetchEvent(
|
| proxy_->dispatchFetchEvent(current_request_id_);
|
| }
|
|
|
| +void ServiceWorkerScriptContext::OnMessage(
|
| + const base::string16& message,
|
| + const std::vector<int>& sent_message_port_ids,
|
| + const std::vector<int>& new_routing_ids) {
|
| +
|
| + std::vector<WebMessagePortChannelImpl*> ports;
|
| + if (!sent_message_port_ids.empty()) {
|
| + base::MessageLoopProxy* loop_proxy = embedded_context_->main_thread_proxy();
|
| + ports.resize(sent_message_port_ids.size());
|
| + for (size_t i = 0; i < sent_message_port_ids.size(); ++i) {
|
| + ports[i] = new WebMessagePortChannelImpl(
|
| + new_routing_ids[i], sent_message_port_ids[i], loop_proxy);
|
| + }
|
| + }
|
| +
|
| + proxy_->dispatchMessageEvent(message, ports);
|
| +}
|
| +
|
| } // namespace content
|
|
|