Revert "Remove OwnPtr from Blink."

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 21 matching lines @@
 #include "bindings/core/v8/SerializedScriptValueFactory.h"
 #include "core/dom/CrossThreadTask.h"
 #include "core/dom/ExceptionCode.h"
 #include "core/dom/ExecutionContext.h"
 #include "core/events/MessageEvent.h"
 #include "core/frame/LocalDOMWindow.h"
 #include "core/inspector/ConsoleMessage.h"
 #include "core/workers/WorkerGlobalScope.h"
 #include "public/platform/WebString.h"
 #include "wtf/Functional.h"
-#include "wtf/PtrUtil.h"
 #include "wtf/text/AtomicString.h"
-#include <memory>
 
 namespace blink {
 
 MessagePort* MessagePort::create(ExecutionContext& executionContext)
 {
     MessagePort* port = new MessagePort(executionContext);
     port->suspendIfNeeded();
     return port;
 }
 
@@ skipping 19 matching lines @@
     DCHECK(getExecutionContext());
     DCHECK(m_entangledChannel);
 
     // Make sure we aren't connected to any of the passed-in ports.
     for (unsigned i = 0; i < ports.size(); ++i) {
         if (ports[i] == this) {
             exceptionState.throwDOMException(DataCloneError, "Port at index " + String::number(i) + " contains the source port.");
             return;
         }
     }
-    std::unique_ptr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(context, ports, exceptionState);
+    OwnPtr<MessagePortChannelArray> channels = MessagePort::disentanglePorts(context, ports, exceptionState);
     if (exceptionState.hadException())
         return;
 
     if (message->containsTransferableArrayBuffer())
         getExecutionContext()->addConsoleMessage(ConsoleMessage::create(JSMessageSource, WarningMessageLevel, "MessagePort cannot send an ArrayBuffer as a transferable object yet. See http://crbug.com/334408"));
 
     WebString messageString = message->toWireString();
-    std::unique_ptr<WebMessagePortChannelArray> webChannels = toWebMessagePortChannelArray(std::move(channels));
-    m_entangledChannel->postMessage(messageString, webChannels.release());
+    OwnPtr<WebMessagePortChannelArray> webChannels = toWebMessagePortChannelArray(std::move(channels));
+    m_entangledChannel->postMessage(messageString, webChannels.leakPtr());
 }
 
 // static
-std::unique_ptr<WebMessagePortChannelArray> MessagePort::toWebMessagePortChannelArray(std::unique_ptr<MessagePortChannelArray> channels)
+PassOwnPtr<WebMessagePortChannelArray> MessagePort::toWebMessagePortChannelArray(PassOwnPtr<MessagePortChannelArray> channels)
 {
-    std::unique_ptr<WebMessagePortChannelArray> webChannels;
+    OwnPtr<WebMessagePortChannelArray> webChannels;
     if (channels && channels->size()) {
-        webChannels = wrapUnique(new WebMessagePortChannelArray(channels->size()));
+        webChannels = adoptPtr(new WebMessagePortChannelArray(channels->size()));
         for (size_t i = 0; i < channels->size(); ++i)
             (*webChannels)[i] = (*channels)[i].release();
     }
     return webChannels;
 }
 
 // static
 MessagePortArray* MessagePort::toMessagePortArray(ExecutionContext* context, const WebMessagePortChannelArray& webChannels)
 {
-    std::unique_ptr<MessagePortChannelArray> channels = wrapUnique(new MessagePortChannelArray(webChannels.size()));
+    OwnPtr<MessagePortChannelArray> channels = adoptPtr(new MessagePortChannelArray(webChannels.size()));
     for (size_t i = 0; i < webChannels.size(); ++i)
         (*channels)[i] = WebMessagePortChannelUniquePtr(webChannels[i]);
     return MessagePort::entanglePorts(*context, std::move(channels));
 }
 
 WebMessagePortChannelUniquePtr MessagePort::disentangle()
 {
     DCHECK(m_entangledChannel);
     m_entangledChannel->setClient(0);
     return std::move(m_entangledChannel);
@@ skipping 36 matching lines @@
 
     m_entangledChannel = std::move(remote);
     m_entangledChannel->setClient(this);
 }
 
 const AtomicString& MessagePort::interfaceName() const
 {
     return EventTargetNames::MessagePort;
 }
 
-static bool tryGetMessageFrom(WebMessagePortChannel& webChannel, RefPtr<SerializedScriptValue>& message, std::unique_ptr<MessagePortChannelArray>& channels)
+static bool tryGetMessageFrom(WebMessagePortChannel& webChannel, RefPtr<SerializedScriptValue>& message, OwnPtr<MessagePortChannelArray>& channels)
 {
     WebString messageString;
     WebMessagePortChannelArray webChannels;
     if (!webChannel.tryGetMessage(&messageString, webChannels))
         return false;
 
     if (webChannels.size()) {
-        channels = wrapUnique(new MessagePortChannelArray(webChannels.size()));
+        channels = adoptPtr(new MessagePortChannelArray(webChannels.size()));
         for (size_t i = 0; i < webChannels.size(); ++i)
             (*channels)[i] = WebMessagePortChannelUniquePtr(webChannels[i]);
     }
     message = SerializedScriptValue::create(messageString);
     return true;
 }
 
-bool MessagePort::tryGetMessage(RefPtr<SerializedScriptValue>& message, std::unique_ptr<MessagePortChannelArray>& channels)
+bool MessagePort::tryGetMessage(RefPtr<SerializedScriptValue>& message, OwnPtr<MessagePortChannelArray>& channels)
 {
     if (!m_entangledChannel)
         return false;
     return tryGetMessageFrom(*m_entangledChannel, message, channels);
 }
 
 void MessagePort::dispatchMessages()
 {
     // Because close() doesn't cancel any in flight calls to dispatchMessages() we need to check if the port is still open before dispatch.
     if (m_closed)
         return;
 
     // Messages for contexts that are not fully active get dispatched too, but JSAbstractEventListener::handleEvent() doesn't call handlers for these.
     // The HTML5 spec specifies that any messages sent to a document that is not fully active should be dropped, so this behavior is OK.
     if (!started())
         return;
 
     RefPtr<SerializedScriptValue> message;
-    std::unique_ptr<MessagePortChannelArray> channels;
+    OwnPtr<MessagePortChannelArray> channels;
     while (tryGetMessage(message, channels)) {
         // close() in Worker onmessage handler should prevent next message from dispatching.
         if (getExecutionContext()->isWorkerGlobalScope() && toWorkerGlobalScope(getExecutionContext())->isClosing())
             return;
 
         MessagePortArray* ports = MessagePort::entanglePorts(*getExecutionContext(), std::move(channels));
         Event* evt = MessageEvent::create(ports, message.release());
 
         dispatchEvent(evt);
     }
 }
 
 bool MessagePort::hasPendingActivity() const
 {
     // The spec says that entangled message ports should always be treated as if they have a strong reference.
     // We'll also stipulate that the queue needs to be open (if the app drops its reference to the port before start()-ing it, then it's not really entangled as it's unreachable).
     return m_started && isEntangled();
 }
 
-std::unique_ptr<MessagePortChannelArray> MessagePort::disentanglePorts(ExecutionContext* context, const MessagePortArray& ports, ExceptionState& exceptionState)
+PassOwnPtr<MessagePortChannelArray> MessagePort::disentanglePorts(ExecutionContext* context, const MessagePortArray& ports, ExceptionState& exceptionState)
 {
     if (!ports.size())
         return nullptr;
 
     HeapHashSet<Member<MessagePort>> visited;
 
     // Walk the incoming array - if there are any duplicate ports, or null ports or cloned ports, throw an error (per section 8.3.3 of the HTML5 spec).
     for (unsigned i = 0; i < ports.size(); ++i) {
         MessagePort* port = ports[i];
         if (!port || port->isNeutered() || visited.contains(port)) {
             String type;
             if (!port)
                 type = "null";
             else if (port->isNeutered())
                 type = "already neutered";
             else
                 type = "a duplicate";
             exceptionState.throwDOMException(DataCloneError, "Port at index "  + String::number(i) + " is " + type + ".");
             return nullptr;
         }
         visited.add(port);
     }
 
     UseCounter::count(context, UseCounter::MessagePortsTransferred);
 
     // Passed-in ports passed validity checks, so we can disentangle them.
-    std::unique_ptr<MessagePortChannelArray> portArray = wrapUnique(new MessagePortChannelArray(ports.size()));
+    OwnPtr<MessagePortChannelArray> portArray = adoptPtr(new MessagePortChannelArray(ports.size()));
     for (unsigned i = 0; i < ports.size(); ++i)
         (*portArray)[i] = ports[i]->disentangle();
     return portArray;
 }
 
-MessagePortArray* MessagePort::entanglePorts(ExecutionContext& context, std::unique_ptr<MessagePortChannelArray> channels)
+MessagePortArray* MessagePort::entanglePorts(ExecutionContext& context, PassOwnPtr<MessagePortChannelArray> channels)
 {
     // https://html.spec.whatwg.org/multipage/comms.html#message-ports
     // |ports| should be an empty array, not null even when there is no ports.
     if (!channels || !channels->size())
         return new MessagePortArray;
 
     MessagePortArray* portArray = new MessagePortArray(channels->size());
     for (unsigned i = 0; i < channels->size(); ++i) {
         MessagePort* port = MessagePort::create(context);
         port->entangle(std::move((*channels)[i]));
         (*portArray)[i] = port;
     }
     return portArray;
 }
 
 DEFINE_TRACE(MessagePort)
 {
     ActiveDOMObject::trace(visitor);
     EventTargetWithInlineData::trace(visitor);
 }
 
 } // namespace blink