Updating Worker.postMessage(), DOMWindow.postMessage(), and...

chrome/worker/webworkerclient_proxy.cc

 // Copyright (c) 2009 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 "chrome/worker/webworkerclient_proxy.h"
 
 #include "base/command_line.h"
 #include "chrome/common/child_process.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/webmessageportchannel_impl.h"
 #include "chrome/common/worker_messages.h"
 #include "chrome/renderer/webworker_proxy.h"
 #include "chrome/worker/worker_thread.h"
 #include "chrome/worker/nativewebworker_impl.h"
 #include "ipc/ipc_logging.h"
 #include "webkit/api/public/WebString.h"
 #include "webkit/api/public/WebURL.h"
 #include "webkit/api/public/WebWorker.h"
 
 using WebKit::WebMessagePortChannel;
+using WebKit::WebMessagePortChannelArray;
 using WebKit::WebString;
 using WebKit::WebWorker;
 using WebKit::WebWorkerClient;
 
 namespace {
 
 // How long to wait for worker to finish after it's been told to terminate.
 static const int kMaxTimeForRunawayWorkerMs = 3000;
 
 class KillProcessTask : public Task {
@@ skipping 43 matching lines @@
   ChildProcess::current()->AddRefProcess();
 }
 
 WebWorkerClientProxy::~WebWorkerClientProxy() {
   WorkerThread::current()->RemoveRoute(route_id_);
   ChildProcess::current()->ReleaseProcess();
 }
 
 void WebWorkerClientProxy::postMessageToWorkerObject(
     const WebString& message,
-    WebMessagePortChannel* channel) {
-  int message_port_id = MSG_ROUTING_NONE;
-  if (channel) {
+    const WebMessagePortChannelArray& channels) {
+  std::vector<int> message_port_ids(channels.size());
+  std::vector<int> routing_ids(channels.size());
+  for (size_t i = 0; i < channels.size(); ++i) {
     WebMessagePortChannelImpl* webchannel =
-        static_cast<WebMessagePortChannelImpl*>(channel);
-    message_port_id = webchannel->message_port_id();
+        static_cast<WebMessagePortChannelImpl*>(channels[i]);
+    message_port_ids[i] = webchannel->message_port_id();
     webchannel->QueueMessages();
-    DCHECK(message_port_id != MSG_ROUTING_NONE);
+    DCHECK(message_port_ids[i] != MSG_ROUTING_NONE);
+    routing_ids[i] = MSG_ROUTING_NONE;
   }
 
   Send(new WorkerMsg_PostMessage(
-      route_id_, message, message_port_id, MSG_ROUTING_NONE));
+      route_id_, message, message_port_ids, routing_ids));
 }
 
 void WebWorkerClientProxy::postExceptionToWorkerObject(
     const WebString& error_message,
     int line_number,
     const WebString& source_url) {
   Send(new WorkerHostMsg_PostExceptionToWorkerObject(
       route_id_, error_message, line_number, source_url));
 }
 
@@ skipping 66 matching lines @@
     // Can't kill the process since there could be workers from other
     // renderer process.
     NOTIMPLEMENTED();
     return;
   }
 
   MessageLoop::current()->PostDelayedTask(FROM_HERE,
       new KillProcessTask(this), kMaxTimeForRunawayWorkerMs);
 }
 
-void WebWorkerClientProxy::OnPostMessage(const string16& message,
-                                         int sent_message_port_id,
-                                         int new_routing_id) {
-  WebMessagePortChannel* channel = NULL;
-  if (sent_message_port_id != MSG_ROUTING_NONE) {
-    channel = new WebMessagePortChannelImpl(
-        new_routing_id, sent_message_port_id);
+void WebWorkerClientProxy::OnPostMessage(
+    const string16& message,
+    const std::vector<int>& sent_message_port_ids,
+    const std::vector<int>& new_routing_ids) {
+  WebMessagePortChannelArray channels(sent_message_port_ids.size());
+  for (size_t i = 0; i < sent_message_port_ids.size(); i++) {
+    channels[i] = new WebMessagePortChannelImpl(
+        new_routing_ids[i], sent_message_port_ids[i]);
   }
 
-  impl_->postMessageToWorkerContext(message, channel);
+  impl_->postMessageToWorkerContext(message, channels);
 }