Remove OwnPtr::release() calls in core/ (part 2).

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 69 matching lines @@
         }
     }
     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();
-    OwnPtr<WebMessagePortChannelArray> webChannels = toWebMessagePortChannelArray(channels.release());
+    OwnPtr<WebMessagePortChannelArray> webChannels = toWebMessagePortChannelArray(std::move(channels));
     m_entangledChannel->postMessage(messageString, webChannels.leakPtr());
 }
 
 // static
 PassOwnPtr<WebMessagePortChannelArray> MessagePort::toWebMessagePortChannelArray(PassOwnPtr<MessagePortChannelArray> channels)
 {
     OwnPtr<WebMessagePortChannelArray> webChannels;
     if (channels && channels->size()) {
         webChannels = adoptPtr(new WebMessagePortChannelArray(channels->size()));
         for (size_t i = 0; i < channels->size(); ++i)
             (*webChannels)[i] = (*channels)[i].leakPtr();
     }
-    return webChannels.release();
+    return webChannels;
 }
 
 // static
 MessagePortArray* MessagePort::toMessagePortArray(ExecutionContext* context, const WebMessagePortChannelArray& webChannels)
 {
     OwnPtr<MessagePortChannelArray> channels = adoptPtr(new MessagePortChannelArray(webChannels.size()));
     for (size_t i = 0; i < webChannels.size(); ++i)
         (*channels)[i] = adoptPtr(webChannels[i]);
-    return MessagePort::entanglePorts(*context, channels.release());
+    return MessagePort::entanglePorts(*context, std::move(channels));
 }
 
 PassOwnPtr<WebMessagePortChannel> MessagePort::disentangle()
 {
     DCHECK(m_entangledChannel);
     m_entangledChannel->setClient(0);
-    return m_entangledChannel.release();
+    return std::move(m_entangledChannel);
 }
 
 // Invoked to notify us that there are messages available for this port.
 // This code may be called from another thread, and so should not call any non-threadsafe APIs (i.e. should not call into the entangled channel or access mutable variables).
 void MessagePort::messageAvailable()
 {
     DCHECK(getExecutionContext());
     getExecutionContext()->postTask(BLINK_FROM_HERE, createCrossThreadTask(&MessagePort::dispatchMessages, CrossThreadWeakPersistentThisPointer<MessagePort>(this)));
 }
 
@@ skipping 67 matching lines @@
     if (!started())
         return;
 
     RefPtr<SerializedScriptValue> message;
     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(), channels.release());
+        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).
@@ skipping 23 matching lines @@
         }
         visited.add(port);
     }
 
     UseCounter::count(context, UseCounter::MessagePortsTransferred);
 
     // Passed-in ports passed validity checks, so we can disentangle them.
     OwnPtr<MessagePortChannelArray> portArray = adoptPtr(new MessagePortChannelArray(ports.size()));
     for (unsigned i = 0; i < ports.size(); ++i)
         (*portArray)[i] = ports[i]->disentangle();
-    return portArray.release();
+    return portArray;
 }
 
 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((*channels)[i].release());
+        port->entangle(std::move((*channels)[i]));
         (*portArray)[i] = port;
     }
     return portArray;
 }
 
 DEFINE_TRACE(MessagePort)
 {
     ActiveDOMObject::trace(visitor);
     EventTargetWithInlineData::trace(visitor);
 }
 
 } // namespace blink