Enable Blink to pass extra Mojo handles across MessagePorts

content/child/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/child/webmessageportchannel_impl.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/ptr_util.h"
 #include "third_party/WebKit/public/platform/WebMessagePortChannelClient.h"
 #include "third_party/WebKit/public/platform/WebString.h"
 
 using blink::WebMessagePortChannel;
 using blink::WebMessagePortChannelArray;
 using blink::WebMessagePortChannelClient;
 using blink::WebString;
+using blink::WebVector;
 
 namespace content {
 
 WebMessagePortChannelImpl::~WebMessagePortChannelImpl() {
   setClient(nullptr);
 }
 
 WebMessagePortChannelImpl::WebMessagePortChannelImpl(
     MessagePort message_port)
     : port_(message_port.ReleaseHandle()) {
@@ skipping 58 matching lines @@
     port_.SetCallback(
         base::Bind(&WebMessagePortChannelClient::messageAvailable,
                    base::Unretained(client)));
   } else {
     port_.ClearCallback();
   }
 }
 
 void WebMessagePortChannelImpl::postMessage(
     const WebString& encoded_message,
-    WebMessagePortChannelArray channels) {
+    WebMessagePortChannelArray channels,
+    WebVector<mojo::ScopedHandle> handles) {
   std::vector<MessagePort> ports;
   if (!channels.isEmpty()) {
     ports.resize(channels.size());
     for (size_t i = 0; i < channels.size(); ++i) {
       ports[i] = static_cast<WebMessagePortChannelImpl*>(channels[i].get())->
           ReleaseMessagePort();
     }
   }
-  port_.PostMessage(encoded_message.utf16(), std::move(ports));
+  std::vector<mojo::ScopedHandle> extra_handles;
+  for (size_t i = 0; i < handles.size(); ++i)
+    extra_handles.emplace_back(std::move(handles[i]));
+  port_.PostMessage(encoded_message.utf16(), std::move(ports),
+                    std::move(extra_handles));
 }
 
 bool WebMessagePortChannelImpl::tryGetMessage(
     WebString* encoded_message,
-    WebMessagePortChannelArray& channels) {
+    WebMessagePortChannelArray& channels,
+    WebVector<mojo::ScopedHandle>& handles) {
   base::string16 buffer;
   std::vector<MessagePort> ports;
-  if (!port_.GetMessage(&buffer, &ports))
+  std::vector<mojo::ScopedHandle> extra_handles;
+  if (!port_.GetMessage(&buffer, &ports, &extra_handles))
     return false;
 
   *encoded_message = WebString::fromUTF16(buffer);
 
   if (!ports.empty()) {
     channels = WebMessagePortChannelArray(ports.size());
     for (size_t i = 0; i < ports.size(); ++i)
       channels[i] = base::MakeUnique<WebMessagePortChannelImpl>(ports[i]);
   }
+  if (!extra_handles.empty()) {
+    handles = WebVector<mojo::ScopedHandle>(extra_handles.size());
+    for (size_t i = 0; i < extra_handles.size(); ++i)
+      handles[i] = std::move(extra_handles[i]);
+  }
   return true;
 }
 
 }  // namespace content