Support Transferable objects

content/common/webmessageportchannel_impl.cc

 // Copyright (c) 2011 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/common/webmessageportchannel_impl.h"
 
 #include "content/common/child_process.h"
 #include "content/common/child_thread.h"
 #include "content/common/worker_messages.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebString.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebMessagePortChannelClient.h"
 
 using WebKit::WebMessagePortChannel;
-using WebKit::WebMessagePortChannelArray;
+using WebKit::WebTransferableReceiptArray;
 using WebKit::WebMessagePortChannelClient;
 using WebKit::WebString;
 
 WebMessagePortChannelImpl::WebMessagePortChannelImpl()
     : client_(NULL),
       route_id_(MSG_ROUTING_NONE),
       message_port_id_(MSG_ROUTING_NONE) {
   AddRef();
   Init();
 }
@@ skipping 44 matching lines @@
   // The message port ids might not be set up yet, if this channel wasn't
   // created on the main thread.  So need to wait until we're on the main thread
   // before getting the other message port id.
   scoped_refptr<WebMessagePortChannelImpl> webchannel(
       static_cast<WebMessagePortChannelImpl*>(channel));
   Entangle(webchannel);
 }
 
 void WebMessagePortChannelImpl::postMessage(
     const WebString& message,
-    WebMessagePortChannelArray* channels) {
+    WebTransferableReceiptArray* receipts) {
   if (MessageLoop::current() != ChildThread::current()->message_loop()) {
     ChildThread::current()->message_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(this, &WebMessagePortChannelImpl::postMessage,
-            message, channels));
+            message, receipts));
     return;
   }
 
-  std::vector<int> message_port_ids(channels ? channels->size() : 0);
-  if (channels) {
+  std::vector<int> message_port_ids(receipts ? receipts->size() : 0);
+  if (receipts) {
     // Extract the port IDs from the source array, then free it.
-    for (size_t i = 0; i < channels->size(); ++i) {
+    for (size_t i = 0; i < receipts->size(); ++i) {
       WebMessagePortChannelImpl* webchannel =
-          static_cast<WebMessagePortChannelImpl*>((*channels)[i]);
+          static_cast<WebMessagePortChannelImpl*>((*receipts)[i]);
       message_port_ids[i] = webchannel->message_port_id();
       webchannel->QueueMessages();
       DCHECK(message_port_ids[i] != MSG_ROUTING_NONE);
     }
-    delete channels;
+    delete receipts;
   }
 
   IPC::Message* msg = new WorkerProcessHostMsg_PostMessage(
       message_port_id_, message, message_port_ids);
   Send(msg);
 }
 
 bool WebMessagePortChannelImpl::tryGetMessage(
     WebString* message,
-    WebMessagePortChannelArray& channels) {
+    WebTransferableReceiptArray& receipts) {
   base::AutoLock auto_lock(lock_);
   if (message_queue_.empty())
     return false;
 
   *message = message_queue_.front().message;
   const std::vector<WebMessagePortChannelImpl*>& channel_array =
       message_queue_.front().ports;
-  WebMessagePortChannelArray result_ports(channel_array.size());
+  WebTransferableReceiptArray result_ports(channel_array.size());
   for (size_t i = 0; i < channel_array.size(); i++) {
     result_ports[i] = channel_array[i];
   }
 
-  channels.swap(result_ports);
+  receipts.swap(result_ports);
   message_queue_.pop();
   return true;
 }
 
 void WebMessagePortChannelImpl::Init() {
   if (MessageLoop::current() != ChildThread::current()->message_loop()) {
     ChildThread::current()->message_loop()->PostTask(FROM_HERE,
         NewRunnableMethod(this, &WebMessagePortChannelImpl::Init));
     return;
   }
@@ skipping 104 matching lines @@
 
   message_port_id_ = MSG_ROUTING_NONE;
 
   Release();
   ChildProcess::current()->ReleaseProcess();
 }
 
 WebMessagePortChannelImpl::Message::Message() {}
 
 WebMessagePortChannelImpl::Message::~Message() {}