HTML MessagePort as mojo::MessagePipeHandle

third_party/WebKit/Source/core/dom/MessagePort.cpp

 /*
  * Copyright (C) 2008 Apple Inc. All Rights Reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 77 matching lines @@
 
 // static
 std::unique_ptr<WebMessagePortChannelArray>
 MessagePort::toWebMessagePortChannelArray(
     std::unique_ptr<MessagePortChannelArray> channels) {
   std::unique_ptr<WebMessagePortChannelArray> webChannels;
   if (channels && channels->size()) {
     webChannels =
         WTF::wrapUnique(new WebMessagePortChannelArray(channels->size()));
     for (size_t i = 0; i < channels->size(); ++i)
-      (*webChannels)[i] = (*channels)[i].release();
+      (*webChannels)[i].reset((*channels)[i].release());

[dcheng, 2017/02/07 00:01:37]

Nit: does webChannels[i] = std::move((*channels)[i]) work here?

[darin (slow to review), 2017/02/07 00:06:13]

Done.

   }
   return webChannels;
 }
 
 // static
 MessagePortArray* MessagePort::toMessagePortArray(
     ExecutionContext* context,
-    const WebMessagePortChannelArray& webChannels) {
+    WebMessagePortChannelArray webChannels) {
   std::unique_ptr<MessagePortChannelArray> channels =
       WTF::wrapUnique(new MessagePortChannelArray(webChannels.size()));
   for (size_t i = 0; i < webChannels.size(); ++i)
-    (*channels)[i] = WebMessagePortChannelUniquePtr(webChannels[i]);
+    (*channels)[i] = std::move(webChannels[i]);
   return MessagePort::entanglePorts(*context, std::move(channels));
 }
 
 WebMessagePortChannelUniquePtr MessagePort::disentangle() {
   DCHECK(m_entangledChannel);
   m_entangledChannel->setClient(nullptr);
   return std::move(m_entangledChannel);
 }
 
 // Invoked to notify us that there are messages available for this port.
@@ skipping 47 matching lines @@
     RefPtr<SerializedScriptValue>& message,
     std::unique_ptr<MessagePortChannelArray>& channels) {
   WebString messageString;
   WebMessagePortChannelArray webChannels;
   if (!webChannel.tryGetMessage(&messageString, webChannels))
     return false;
 
   if (webChannels.size()) {
     channels = WTF::wrapUnique(new MessagePortChannelArray(webChannels.size()));
     for (size_t i = 0; i < webChannels.size(); ++i)
-      (*channels)[i] = WebMessagePortChannelUniquePtr(webChannels[i]);
+      (*channels)[i] = std::move(webChannels[i]);
   }
   message = SerializedScriptValue::create(messageString);
   return true;
 }
 
 bool MessagePort::tryGetMessage(
     RefPtr<SerializedScriptValue>& message,
     std::unique_ptr<MessagePortChannelArray>& channels) {
   if (!m_entangledChannel)
     return false;
@@ skipping 99 matching lines @@
   }
   return portArray;
 }
 
 DEFINE_TRACE(MessagePort) {
   ContextLifecycleObserver::trace(visitor);
   EventTargetWithInlineData::trace(visitor);
 }
 
 }  // namespace blink