Revert of Move DOMArrayBuffer, DOMArrayBufferViews and DataView to the heap.

third_party/WebKit/Source/modules/presentation/PresentationConnection.cpp

 // Copyright 2014 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 "modules/presentation/PresentationConnection.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "core/dom/DOMArrayBuffer.h"
 #include "core/dom/DOMArrayBufferView.h"
 #include "core/dom/Document.h"
@@ skipping 70 matching lines @@
     return errorValue;
 }
 
 void throwPresentationDisconnectedError(ExceptionState& exceptionState)
 {
     exceptionState.throwDOMException(InvalidStateError, "Presentation connection is disconnected.");
 }
 
 } // namespace
 
-class PresentationConnection::Message final : public GarbageCollectedFinalized<PresentationConnection::Message> {
-public:
-    Message(const String& text)
-        : type(MessageTypeText)
-        , text(text)
-    {
-    }
-
-    Message(DOMArrayBuffer* arrayBuffer)
-        : type(MessageTypeArrayBuffer)
-        , arrayBuffer(arrayBuffer)
-    {
-    }
-
-    Message(PassRefPtr<BlobDataHandle> blobDataHandle)
-        : type(MessageTypeBlob)
-        , blobDataHandle(blobDataHandle)
-    {
-    }
-
-    DEFINE_INLINE_TRACE()
-    {
-        visitor->trace(arrayBuffer);
-    }
-
-    MessageType type;
-    String text;
-    Member<DOMArrayBuffer> arrayBuffer;
-    RefPtr<BlobDataHandle> blobDataHandle;
-};
-
 class PresentationConnection::BlobLoader final : public GarbageCollectedFinalized<PresentationConnection::BlobLoader>, public FileReaderLoaderClient {
 public:
     BlobLoader(PassRefPtr<BlobDataHandle> blobDataHandle, PresentationConnection* PresentationConnection)
         : m_PresentationConnection(PresentationConnection)
         , m_loader(FileReaderLoader::ReadAsArrayBuffer, this)
     {
         m_loader.start(m_PresentationConnection->getExecutionContext(), blobDataHandle);
     }
     ~BlobLoader() override { }
 
@@ skipping 94 matching lines @@
         UseCounter::count(getExecutionContext(), UseCounter::PresentationConnectionTerminateEventListener);
     else if (eventType == EventTypeNames::message)
         UseCounter::count(getExecutionContext(), UseCounter::PresentationConnectionMessageEventListener);
 
     return EventTarget::addEventListenerInternal(eventType, listener, options);
 }
 
 DEFINE_TRACE(PresentationConnection)
 {
     visitor->trace(m_blobLoader);
-    visitor->trace(m_messages);
     RefCountedGarbageCollectedEventTargetWithInlineData<PresentationConnection>::trace(visitor);
     DOMWindowProperty::trace(visitor);
 }
 
 const AtomicString& PresentationConnection::state() const
 {
     return connectionStateToString(m_state);
 }
 
 void PresentationConnection::send(const String& message, ExceptionState& exceptionState)
 {
     if (!canSendMessage(exceptionState))
         return;
 
-    m_messages.append(new Message(message));
+    m_messages.append(adoptPtr(new Message(message)));
     handleMessageQueue();
 }
 
-void PresentationConnection::send(DOMArrayBuffer* arrayBuffer, ExceptionState& exceptionState)
+void PresentationConnection::send(PassRefPtr<DOMArrayBuffer> arrayBuffer, ExceptionState& exceptionState)
 {
     ASSERT(arrayBuffer && arrayBuffer->buffer());
     if (!canSendMessage(exceptionState))
         return;
 
-    m_messages.append(new Message(arrayBuffer));
+    m_messages.append(adoptPtr(new Message(arrayBuffer)));
     handleMessageQueue();
 }
 
-void PresentationConnection::send(DOMArrayBufferView* arrayBufferView, ExceptionState& exceptionState)
+void PresentationConnection::send(PassRefPtr<DOMArrayBufferView> arrayBufferView, ExceptionState& exceptionState)
 {
     ASSERT(arrayBufferView);
     if (!canSendMessage(exceptionState))
         return;
 
-    m_messages.append(new Message(arrayBufferView->buffer()));
+    m_messages.append(adoptPtr(new Message(arrayBufferView->buffer())));
     handleMessageQueue();
 }
 
 void PresentationConnection::send(Blob* data, ExceptionState& exceptionState)
 {
     ASSERT(data);
     if (!canSendMessage(exceptionState))
         return;
 
-    m_messages.append(new Message(data->blobDataHandle()));
+    m_messages.append(adoptPtr(new Message(data->blobDataHandle())));
     handleMessageQueue();
 }
 
 bool PresentationConnection::canSendMessage(ExceptionState& exceptionState)
 {
     if (m_state != WebPresentationConnectionState::Connected) {
         throwPresentationDisconnectedError(exceptionState);
         return false;
     }
 
@@ skipping 66 matching lines @@
 
     switch (m_binaryType) {
     case BinaryTypeBlob: {
         OwnPtr<BlobData> blobData = BlobData::create();
         blobData->appendBytes(data, length);
         Blob* blob = Blob::create(BlobDataHandle::create(blobData.release(), length));
         dispatchEvent(MessageEvent::create(blob));
         return;
     }
     case BinaryTypeArrayBuffer:
-        DOMArrayBuffer* buffer = DOMArrayBuffer::create(data, length);
-        dispatchEvent(MessageEvent::create(buffer));
+        RefPtr<DOMArrayBuffer> buffer = DOMArrayBuffer::create(data, length);
+        dispatchEvent(MessageEvent::create(buffer.release()));
         return;
     }
     ASSERT_NOT_REACHED();
 }
 
 void PresentationConnection::close()
 {
     if (m_state != WebPresentationConnectionState::Connected)
         return;
     WebPresentationClient* client = presentationClient(getExecutionContext());
@@ skipping 42 matching lines @@
 
 void PresentationConnection::didClose(WebPresentationConnectionCloseReason reason, const String& message)
 {
     if (m_state == WebPresentationConnectionState::Closed)
         return;
 
     m_state = WebPresentationConnectionState::Closed;
     dispatchEvent(PresentationConnectionCloseEvent::create(EventTypeNames::close, connectionCloseReasonToString(reason), message));
 }
 
-void PresentationConnection::didFinishLoadingBlob(DOMArrayBuffer* buffer)
+void PresentationConnection::didFinishLoadingBlob(PassRefPtr<DOMArrayBuffer> buffer)
 {
     ASSERT(!m_messages.isEmpty() && m_messages.first()->type == MessageTypeBlob);
     ASSERT(buffer && buffer->buffer());
     // Send the loaded blob immediately here and continue processing the queue.
     WebPresentationClient* client = presentationClient(getExecutionContext());
     if (client)
         client->sendBlobData(m_url, m_id, static_cast<const uint8_t*>(buffer->data()), buffer->byteLength());
 
     m_messages.removeFirst();
     m_blobLoader.clear();
@@ skipping 10 matching lines @@
     handleMessageQueue();
 }
 
 void PresentationConnection::tearDown()
 {
     // Cancel current Blob loading if any.
     if (m_blobLoader) {
         m_blobLoader->cancel();
         m_blobLoader.clear();
     }
-    m_messages.clear();
+
+    // Clear message queue.
+    Deque<OwnPtr<Message>> empty;
+    m_messages.swap(empty);
 }
 
 } // namespace blink