ServiceWorker: Introduce ServiceWorkerMessageEvent to replace MessageEvent (2/3).

content/child/service_worker/service_worker_dispatcher.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/child/service_worker/service_worker_dispatcher.h"
 
 #include "base/lazy_instance.h"
 #include "base/stl_util.h"
 #include "base/threading/thread_local.h"
 #include "base/trace_event/trace_event.h"
@@ skipping 598 matching lines @@
 
   ProviderClientMap::iterator found = provider_clients_.find(provider_id);
   if (found != provider_clients_.end()) {
     // Populate the .controller field with the new worker object.
     found->second->setController(GetServiceWorker(info, false),
                                  should_notify_controllerchange);
   }
 }
 
 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.
     return;
   }
 
   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(
     int handle_id, WebServiceWorkerImpl* worker) {
   DCHECK(!ContainsKey(service_workers_, handle_id));
   service_workers_[handle_id] = worker;
 }
 
 void ServiceWorkerDispatcher::RemoveServiceWorker(int handle_id) {
   DCHECK(ContainsKey(service_workers_, handle_id));
@@ skipping 33 matching lines @@
   bool adopt_handle = true;
   WebServiceWorkerRegistrationImpl* registration =
       CreateServiceWorkerRegistration(info, adopt_handle);
   registration->SetInstalling(GetServiceWorker(attrs.installing, adopt_handle));
   registration->SetWaiting(GetServiceWorker(attrs.waiting, adopt_handle));
   registration->SetActive(GetServiceWorker(attrs.active, adopt_handle));
   return registration;
 }
 
 }  // namespace content