Index: content/child/service_worker/service_worker_dispatcher.cc |
diff --git a/content/child/service_worker/service_worker_dispatcher.cc b/content/child/service_worker/service_worker_dispatcher.cc |
index dfbcfc18f6c06fb4e2e20fd6796f1fa9e81b3b64..6de57e5f68171567c40b277368abc4ef565a5212 100644 |
--- a/content/child/service_worker/service_worker_dispatcher.cc |
+++ b/content/child/service_worker/service_worker_dispatcher.cc |
@@ -616,19 +616,15 @@ void ServiceWorkerDispatcher::OnSetControllerServiceWorker( |
} |
void ServiceWorkerDispatcher::OnPostMessage( |
- int thread_id, |
- int provider_id, |
- const base::string16& message, |
- const std::vector<TransferredMessagePort>& sent_message_ports, |
- const std::vector<int>& new_routing_ids) { |
+ const ServiceWorkerMsg_MessageToDocument_Params& params) { |
// Make sure we're on the main document thread. (That must be the only |
// thread we get this message) |
DCHECK(ChildThreadImpl::current()); |
- TRACE_EVENT1("ServiceWorker", |
- "ServiceWorkerDispatcher::OnPostMessage", |
- "Thread ID", thread_id); |
+ TRACE_EVENT1("ServiceWorker", "ServiceWorkerDispatcher::OnPostMessage", |
+ "Thread ID", params.thread_id); |
- ProviderClientMap::iterator found = provider_clients_.find(provider_id); |
+ ProviderClientMap::iterator found = |
+ provider_clients_.find(params.provider_id); |
if (found == provider_clients_.end()) { |
// For now we do no queueing for messages sent to nonexistent / unattached |
// client. |
@@ -636,11 +632,13 @@ void ServiceWorkerDispatcher::OnPostMessage( |
} |
blink::WebMessagePortChannelArray ports = |
- WebMessagePortChannelImpl::CreatePorts(sent_message_ports, |
- new_routing_ids, |
+ WebMessagePortChannelImpl::CreatePorts(params.message_ports, |
+ params.new_routing_ids, |
base::MessageLoopProxy::current()); |
- found->second->dispatchMessageEvent(message, ports); |
+ found->second->dispatchMessageEvent( |
+ GetServiceWorker(params.service_worker_info, false), |
falken
2015/05/18 03:37:09
nit: false /* adopt_handle */
xiang
2015/06/15 02:37:34
Done.
|
+ params.message, ports); |
} |
void ServiceWorkerDispatcher::AddServiceWorker( |