Rename NewWebSocketChannelImpl to DocumentWebSocketChannel.

Source/modules/websockets/NewWebSocketChannelImpl.cpp

Index: Source/modules/websockets/NewWebSocketChannelImpl.cpp
diff --git a/Source/modules/websockets/NewWebSocketChannelImpl.cpp b/Source/modules/websockets/NewWebSocketChannelImpl.cpp
deleted file mode 100644
index 315f4ec94225e2f6495fefe8a98976b7fab54ec5..0000000000000000000000000000000000000000
--- a/Source/modules/websockets/NewWebSocketChannelImpl.cpp
+++ /dev/null
@@ -1,594 +0,0 @@
-/*
- * Copyright (C) 2013 Google 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:
- *
- *     * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *     * Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following disclaimer
- * in the documentation and/or other materials provided with the
- * distribution.
- *     * Neither the name of Google Inc. nor the names of its
- * contributors may be used to endorse or promote products derived from
- * this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
- * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
- * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
- * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
- * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
- * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-#include "config.h"
-#include "modules/websockets/NewWebSocketChannelImpl.h"
-
-#include "core/dom/Document.h"
-#include "core/dom/ExecutionContext.h"
-#include "core/fileapi/FileReaderLoader.h"
-#include "core/fileapi/FileReaderLoaderClient.h"
-#include "core/frame/LocalFrame.h"
-#include "core/inspector/ConsoleMessage.h"
-#include "core/inspector/InspectorInstrumentation.h"
-#include "core/inspector/InspectorTraceEvents.h"
-#include "core/loader/FrameLoader.h"
-#include "core/loader/FrameLoaderClient.h"
-#include "core/loader/MixedContentChecker.h"
-#include "core/loader/UniqueIdentifier.h"
-#include "modules/websockets/WebSocketChannelClient.h"
-#include "modules/websockets/WebSocketFrame.h"
-#include "platform/Logging.h"
-#include "platform/network/WebSocketHandshakeRequest.h"
-#include "platform/weborigin/SecurityOrigin.h"
-#include "public/platform/Platform.h"
-#include "public/platform/WebSerializedOrigin.h"
-#include "public/platform/WebSocketHandshakeRequestInfo.h"
-#include "public/platform/WebSocketHandshakeResponseInfo.h"
-#include "public/platform/WebString.h"
-#include "public/platform/WebURL.h"
-#include "public/platform/WebVector.h"
-
-using blink::WebSocketHandle;
-
-namespace blink {
-
-class NewWebSocketChannelImpl::BlobLoader final : public GarbageCollectedFinalized<NewWebSocketChannelImpl::BlobLoader>, public FileReaderLoaderClient {
-public:
-    BlobLoader(PassRefPtr<BlobDataHandle>, NewWebSocketChannelImpl*);
-    virtual ~BlobLoader() { }
-
-    void cancel();
-
-    // FileReaderLoaderClient functions.
-    virtual void didStartLoading() override { }
-    virtual void didReceiveData() override { }
-    virtual void didFinishLoading() override;
-    virtual void didFail(FileError::ErrorCode) override;
-
-    void trace(Visitor* visitor)
-    {
-        visitor->trace(m_channel);
-    }
-
-private:
-    Member<NewWebSocketChannelImpl> m_channel;
-    FileReaderLoader m_loader;
-};
-
-NewWebSocketChannelImpl::BlobLoader::BlobLoader(PassRefPtr<BlobDataHandle> blobDataHandle, NewWebSocketChannelImpl* channel)
-    : m_channel(channel)
-    , m_loader(FileReaderLoader::ReadAsArrayBuffer, this)
-{
-    m_loader.start(channel->executionContext(), blobDataHandle);
-}
-
-void NewWebSocketChannelImpl::BlobLoader::cancel()
-{
-    m_loader.cancel();
-    // didFail will be called immediately.
-    // |this| is deleted here.
-}
-
-void NewWebSocketChannelImpl::BlobLoader::didFinishLoading()
-{
-    m_channel->didFinishLoadingBlob(m_loader.arrayBufferResult());
-    // |this| is deleted here.
-}
-
-void NewWebSocketChannelImpl::BlobLoader::didFail(FileError::ErrorCode errorCode)
-{
-    m_channel->didFailLoadingBlob(errorCode);
-    // |this| is deleted here.
-}
-
-NewWebSocketChannelImpl::NewWebSocketChannelImpl(ExecutionContext* context, WebSocketChannelClient* client, const String& sourceURL, unsigned lineNumber, WebSocketHandle *handle)
-    : ContextLifecycleObserver(context)
-    , m_handle(adoptPtr(handle ? handle : Platform::current()->createWebSocketHandle()))
-    , m_client(client)
-    , m_identifier(0)
-    , m_sendingQuota(0)
-    , m_receivedDataSizeForFlowControl(receivedDataSizeForFlowControlHighWaterMark * 2) // initial quota
-    , m_sentSizeOfTopMessage(0)
-    , m_sourceURLAtConstruction(sourceURL)
-    , m_lineNumberAtConstruction(lineNumber)
-{
-    if (context->isDocument() && toDocument(context)->page())
-        m_identifier = createUniqueIdentifier();
-}
-
-NewWebSocketChannelImpl::~NewWebSocketChannelImpl()
-{
-    ASSERT(!m_blobLoader);
-}
-
-bool NewWebSocketChannelImpl::connect(const KURL& url, const String& protocol)
-{
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p connect()", this);
-    if (!m_handle)
-        return false;
-
-    if (executionContext()->isDocument() && document()->frame()) {
-        if (!document()->frame()->loader().mixedContentChecker()->canConnectInsecureWebSocket(document()->securityOrigin(), url))
-            return false;
-    }
-    if (MixedContentChecker::isMixedContent(document()->securityOrigin(), url)) {
-        String message = "Connecting to a non-secure WebSocket server from a secure origin is deprecated.";
-        document()->addConsoleMessage(ConsoleMessage::create(JSMessageSource, WarningMessageLevel, message));
-    }
-
-    m_url = url;
-    Vector<String> protocols;
-    // Avoid placing an empty token in the Vector when the protocol string is
-    // empty.
-    if (!protocol.isEmpty()) {
-        // Since protocol is already verified and escaped, we can simply split
-        // it.
-        protocol.split(", ", true, protocols);
-    }
-    WebVector<WebString> webProtocols(protocols.size());
-    for (size_t i = 0; i < protocols.size(); ++i) {
-        webProtocols[i] = protocols[i];
-    }
-
-    if (executionContext()->isDocument() && document()->frame())
-        document()->frame()->loader().client()->dispatchWillOpenWebSocket(m_handle.get());
-    m_handle->connect(url, webProtocols, *executionContext()->securityOrigin(), this);
-
-    flowControlIfNecessary();
-    if (m_identifier) {
-        TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "WebSocketCreate", "data", InspectorWebSocketCreateEvent::data(document(), m_identifier, url, protocol));
-        TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack());
-        // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeline migrates to tracing.
-        InspectorInstrumentation::didCreateWebSocket(document(), m_identifier, url, protocol);
-    }
-    return true;
-}
-
-void NewWebSocketChannelImpl::send(const String& message)
-{
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p sendText(%s)", this, message.utf8().data());
-    if (m_identifier) {
-        // FIXME: Change the inspector API to show the entire message instead
-        // of individual frames.
-        CString data = message.utf8();
-        InspectorInstrumentation::didSendWebSocketFrame(document(), m_identifier, WebSocketFrame::OpCodeText, true, data.data(), data.length());
-    }
-    m_messages.append(adoptPtr(new Message(message)));
-    sendInternal();
-}
-
-void NewWebSocketChannelImpl::send(PassRefPtr<BlobDataHandle> blobDataHandle)
-{
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p sendBlob(%s, %s, %llu)", this, blobDataHandle->uuid().utf8().data(), blobDataHandle->type().utf8().data(), blobDataHandle->size());
-    if (m_identifier) {
-        // FIXME: Change the inspector API to show the entire message instead
-        // of individual frames.
-        // FIXME: We can't access the data here.
-        // Since Binary data are not displayed in Inspector, this does not
-        // affect actual behavior.
-        InspectorInstrumentation::didSendWebSocketFrame(document(), m_identifier, WebSocketFrame::OpCodeBinary, true, "", 0);
-    }
-    m_messages.append(adoptPtr(new Message(blobDataHandle)));
-    sendInternal();
-}
-
-void NewWebSocketChannelImpl::send(const ArrayBuffer& buffer, unsigned byteOffset, unsigned byteLength)
-{
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p sendArrayBuffer(%p, %u, %u)", this, buffer.data(), byteOffset, byteLength);
-    if (m_identifier) {
-        // FIXME: Change the inspector API to show the entire message instead
-        // of individual frames.
-        InspectorInstrumentation::didSendWebSocketFrame(document(), m_identifier, WebSocketFrame::OpCodeBinary, true, static_cast<const char*>(buffer.data()) + byteOffset, byteLength);
-    }
-    // buffer.slice copies its contents.
-    // FIXME: Reduce copy by sending the data immediately when we don't need to
-    // queue the data.
-    m_messages.append(adoptPtr(new Message(buffer.slice(byteOffset, byteOffset + byteLength))));
-    sendInternal();
-}
-
-void NewWebSocketChannelImpl::send(PassOwnPtr<Vector<char> > data)
-{
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p sendVector(%p, %llu)", this, data.get(), static_cast<unsigned long long>(data->size()));
-    if (m_identifier) {
-        // FIXME: Change the inspector API to show the entire message instead
-        // of individual frames.
-        InspectorInstrumentation::didSendWebSocketFrame(document(), m_identifier, WebSocketFrame::OpCodeBinary, true, data->data(), data->size());
-    }
-    m_messages.append(adoptPtr(new Message(data)));
-    sendInternal();
-}
-
-void NewWebSocketChannelImpl::close(int code, const String& reason)
-{
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p close(%d, %s)", this, code, reason.utf8().data());
-    ASSERT(m_handle);
-    unsigned short codeToSend = static_cast<unsigned short>(code == CloseEventCodeNotSpecified ? CloseEventCodeNoStatusRcvd : code);
-    m_messages.append(adoptPtr(new Message(codeToSend, reason)));
-    sendInternal();
-}
-
-void NewWebSocketChannelImpl::fail(const String& reason, MessageLevel level, const String& sourceURL, unsigned lineNumber)
-{
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p fail(%s)", this, reason.utf8().data());
-    // m_handle and m_client can be null here.
-
-    if (m_identifier)
-        InspectorInstrumentation::didReceiveWebSocketFrameError(document(), m_identifier, reason);
-    const String message = "WebSocket connection to '" + m_url.elidedString() + "' failed: " + reason;
-    executionContext()->addConsoleMessage(ConsoleMessage::create(JSMessageSource, level, message, sourceURL, lineNumber));
-
-    if (m_client)
-        m_client->didError();
-    // |reason| is only for logging and should not be provided for scripts,
-    // hence close reason must be empty.
-    handleDidClose(false, CloseEventCodeAbnormalClosure, String());
-    // handleDidClose may delete this object.
-}
-
-void NewWebSocketChannelImpl::disconnect()
-{
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p disconnect()", this);
-    if (m_identifier) {
-        TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "WebSocketDestroy", "data", InspectorWebSocketEvent::data(document(), m_identifier));
-        TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack());
-        // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeline migrates to tracing.
-        InspectorInstrumentation::didCloseWebSocket(document(), m_identifier);
-    }
-    abortAsyncOperations();
-    m_handle.clear();
-    m_client = nullptr;
-    m_identifier = 0;
-}
-
-void NewWebSocketChannelImpl::suspend()
-{
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p suspend()", this);
-}
-
-void NewWebSocketChannelImpl::resume()
-{
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p resume()", this);
-}
-
-NewWebSocketChannelImpl::Message::Message(const String& text)
-    : type(MessageTypeText)
-    , text(text.utf8(StrictUTF8ConversionReplacingUnpairedSurrogatesWithFFFD)) { }
-
-NewWebSocketChannelImpl::Message::Message(PassRefPtr<BlobDataHandle> blobDataHandle)
-    : type(MessageTypeBlob)
-    , blobDataHandle(blobDataHandle) { }
-
-NewWebSocketChannelImpl::Message::Message(PassRefPtr<ArrayBuffer> arrayBuffer)
-    : type(MessageTypeArrayBuffer)
-    , arrayBuffer(arrayBuffer) { }
-
-NewWebSocketChannelImpl::Message::Message(PassOwnPtr<Vector<char> > vectorData)
-    : type(MessageTypeVector)
-    , vectorData(vectorData) { }
-
-NewWebSocketChannelImpl::Message::Message(unsigned short code, const String& reason)
-    : type(MessageTypeClose)
-    , code(code)
-    , reason(reason) { }
-
-void NewWebSocketChannelImpl::sendInternal()
-{
-    ASSERT(m_handle);
-    unsigned long consumedBufferedAmount = 0;
-    while (!m_messages.isEmpty() && !m_blobLoader) {
-        bool final = false;
-        Message* message = m_messages.first().get();
-        if (m_sendingQuota <= 0 && message->type != MessageTypeClose)
-            break;
-        switch (message->type) {
-        case MessageTypeText: {
-            WebSocketHandle::MessageType type =
-                m_sentSizeOfTopMessage ? WebSocketHandle::MessageTypeContinuation : WebSocketHandle::MessageTypeText;
-            size_t size = std::min(static_cast<size_t>(m_sendingQuota), message->text.length() - m_sentSizeOfTopMessage);
-            final = (m_sentSizeOfTopMessage + size == message->text.length());
-            m_handle->send(final, type, message->text.data() + m_sentSizeOfTopMessage, size);
-            m_sentSizeOfTopMessage += size;
-            m_sendingQuota -= size;
-            consumedBufferedAmount += size;
-            break;
-        }
-        case MessageTypeBlob:
-            ASSERT(!m_blobLoader);
-            m_blobLoader = new BlobLoader(message->blobDataHandle, this);
-            break;
-        case MessageTypeArrayBuffer: {
-            WebSocketHandle::MessageType type =
-                m_sentSizeOfTopMessage ? WebSocketHandle::MessageTypeContinuation : WebSocketHandle::MessageTypeBinary;
-            size_t size = std::min(static_cast<size_t>(m_sendingQuota), message->arrayBuffer->byteLength() - m_sentSizeOfTopMessage);
-            final = (m_sentSizeOfTopMessage + size == message->arrayBuffer->byteLength());
-            m_handle->send(final, type, static_cast<const char*>(message->arrayBuffer->data()) + m_sentSizeOfTopMessage, size);
-            m_sentSizeOfTopMessage += size;
-            m_sendingQuota -= size;
-            consumedBufferedAmount += size;
-            break;
-        }
-        case MessageTypeVector: {
-            WebSocketHandle::MessageType type =
-                m_sentSizeOfTopMessage ? WebSocketHandle::MessageTypeContinuation : WebSocketHandle::MessageTypeBinary;
-            size_t size = std::min(static_cast<size_t>(m_sendingQuota), message->vectorData->size() - m_sentSizeOfTopMessage);
-            final = (m_sentSizeOfTopMessage + size == message->vectorData->size());
-            m_handle->send(final, type, message->vectorData->data() + m_sentSizeOfTopMessage, size);
-            m_sentSizeOfTopMessage += size;
-            m_sendingQuota -= size;
-            consumedBufferedAmount += size;
-            break;
-        }
-        case MessageTypeClose: {
-            // No message should be sent from now on.
-            ASSERT(m_messages.size() == 1);
-            m_handle->close(message->code, message->reason);
-            final = true;
-            break;
-        }
-        }
-        if (final) {
-            m_messages.removeFirst();
-            m_sentSizeOfTopMessage = 0;
-        }
-    }
-    if (m_client && consumedBufferedAmount > 0)
-        m_client->didConsumeBufferedAmount(consumedBufferedAmount);
-}
-
-void NewWebSocketChannelImpl::flowControlIfNecessary()
-{
-    if (!m_handle || m_receivedDataSizeForFlowControl < receivedDataSizeForFlowControlHighWaterMark) {
-        return;
-    }
-    m_handle->flowControl(m_receivedDataSizeForFlowControl);
-    m_receivedDataSizeForFlowControl = 0;
-}
-
-void NewWebSocketChannelImpl::abortAsyncOperations()
-{
-    if (m_blobLoader) {
-        m_blobLoader->cancel();
-        m_blobLoader.clear();
-    }
-}
-
-void NewWebSocketChannelImpl::handleDidClose(bool wasClean, unsigned short code, const String& reason)
-{
-    m_handle.clear();
-    abortAsyncOperations();
-    if (!m_client) {
-        return;
-    }
-    WebSocketChannelClient* client = m_client;
-    m_client = nullptr;
-    WebSocketChannelClient::ClosingHandshakeCompletionStatus status =
-        wasClean ? WebSocketChannelClient::ClosingHandshakeComplete : WebSocketChannelClient::ClosingHandshakeIncomplete;
-    client->didClose(status, code, reason);
-    // client->didClose may delete this object.
-}
-
-Document* NewWebSocketChannelImpl::document()
-{
-    ASSERT(m_identifier);
-    ExecutionContext* context = executionContext();
-    ASSERT(context->isDocument());
-    return toDocument(context);
-}
-
-void NewWebSocketChannelImpl::didConnect(WebSocketHandle* handle, bool fail, const WebString& selectedProtocol, const WebString& extensions)
-{
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p didConnect(%p, %d, %s, %s)", this, handle, fail, selectedProtocol.utf8().data(), extensions.utf8().data());
-
-    ASSERT(m_handle);
-    ASSERT(handle == m_handle);
-    ASSERT(m_client);
-
-    if (fail) {
-        failAsError("Cannot connect to " + m_url.string() + ".");
-        // failAsError may delete this object.
-        return;
-    }
-    m_client->didConnect(selectedProtocol, extensions);
-}
-
-void NewWebSocketChannelImpl::didStartOpeningHandshake(WebSocketHandle* handle, const WebSocketHandshakeRequestInfo& request)
-{
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p didStartOpeningHandshake(%p)", this, handle);
-
-    ASSERT(m_handle);
-    ASSERT(handle == m_handle);
-
-    if (m_identifier) {
-        TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "WebSocketSendHandshakeRequest", "data", InspectorWebSocketEvent::data(document(), m_identifier));
-        TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack());
-        // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeline migrates to tracing.
-        InspectorInstrumentation::willSendWebSocketHandshakeRequest(document(), m_identifier, &request.toCoreRequest());
-        m_handshakeRequest = WebSocketHandshakeRequest::create(request.toCoreRequest());
-    }
-}
-
-void NewWebSocketChannelImpl::didFinishOpeningHandshake(WebSocketHandle* handle, const WebSocketHandshakeResponseInfo& response)
-{
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p didFinishOpeningHandshake(%p)", this, handle);
-
-    ASSERT(m_handle);
-    ASSERT(handle == m_handle);
-
-    if (m_identifier) {
-        TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "WebSocketReceiveHandshakeResponse", "data", InspectorWebSocketEvent::data(document(), m_identifier));
-        // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeline migrates to tracing.
-        InspectorInstrumentation::didReceiveWebSocketHandshakeResponse(document(), m_identifier, m_handshakeRequest.get(), &response.toCoreResponse());
-    }
-    m_handshakeRequest.clear();
-}
-
-void NewWebSocketChannelImpl::didFail(WebSocketHandle* handle, const WebString& message)
-{
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p didFail(%p, %s)", this, handle, message.utf8().data());
-
-    ASSERT(m_handle);
-    ASSERT(handle == m_handle);
-
-    // This function is called when the browser is required to fail the
-    // WebSocketConnection. Hence we fail this channel by calling
-    // |this->failAsError| function.
-    failAsError(message);
-    // |this| may be deleted.
-}
-
-void NewWebSocketChannelImpl::didReceiveData(WebSocketHandle* handle, bool fin, WebSocketHandle::MessageType type, const char* data, size_t size)
-{
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p didReceiveData(%p, %d, %d, (%p, %zu))", this, handle, fin, type, data, size);
-
-    ASSERT(m_handle);
-    ASSERT(handle == m_handle);
-    ASSERT(m_client);
-    // Non-final frames cannot be empty.
-    ASSERT(fin || size);
-
-    switch (type) {
-    case WebSocketHandle::MessageTypeText:
-        ASSERT(m_receivingMessageData.isEmpty());
-        m_receivingMessageTypeIsText = true;
-        break;
-    case WebSocketHandle::MessageTypeBinary:
-        ASSERT(m_receivingMessageData.isEmpty());
-        m_receivingMessageTypeIsText = false;
-        break;
-    case WebSocketHandle::MessageTypeContinuation:
-        ASSERT(!m_receivingMessageData.isEmpty());
-        break;
-    }
-
-    m_receivingMessageData.append(data, size);
-    m_receivedDataSizeForFlowControl += size;
-    flowControlIfNecessary();
-    if (!fin) {
-        return;
-    }
-    if (m_identifier) {
-        // FIXME: Change the inspector API to show the entire message instead
-        // of individual frames.
-        WebSocketFrame::OpCode opcode = m_receivingMessageTypeIsText ? WebSocketFrame::OpCodeText : WebSocketFrame::OpCodeBinary;
-        WebSocketFrame frame(opcode, m_receivingMessageData.data(), m_receivingMessageData.size(), WebSocketFrame::Final);
-        InspectorInstrumentation::didReceiveWebSocketFrame(document(), m_identifier, frame.opCode, frame.masked, frame.payload, frame.payloadLength);
-    }
-    if (m_receivingMessageTypeIsText) {
-        String message = m_receivingMessageData.isEmpty() ? emptyString() : String::fromUTF8(m_receivingMessageData.data(), m_receivingMessageData.size());
-        m_receivingMessageData.clear();
-        if (message.isNull()) {
-            failAsError("Could not decode a text frame as UTF-8.");
-            // failAsError may delete this object.
-        } else {
-            m_client->didReceiveTextMessage(message);
-        }
-    } else {
-        OwnPtr<Vector<char> > binaryData = adoptPtr(new Vector<char>);
-        binaryData->swap(m_receivingMessageData);
-        m_client->didReceiveBinaryMessage(binaryData.release());
-    }
-}
-
-void NewWebSocketChannelImpl::didClose(WebSocketHandle* handle, bool wasClean, unsigned short code, const WebString& reason)
-{
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p didClose(%p, %d, %u, %s)", this, handle, wasClean, code, String(reason).utf8().data());
-
-    ASSERT(m_handle);
-    ASSERT(handle == m_handle);
-
-    m_handle.clear();
-
-    if (m_identifier) {
-        TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline"), "WebSocketDestroy", "data", InspectorWebSocketEvent::data(document(), m_identifier));
-        TRACE_EVENT_INSTANT1(TRACE_DISABLED_BY_DEFAULT("devtools.timeline.stack"), "CallStack", "stack", InspectorCallStackEvent::currentCallStack());
-        // FIXME(361045): remove InspectorInstrumentation calls once DevTools Timeline migrates to tracing.
-        InspectorInstrumentation::didCloseWebSocket(document(), m_identifier);
-        m_identifier = 0;
-    }
-
-    handleDidClose(wasClean, code, reason);
-    // handleDidClose may delete this object.
-}
-
-void NewWebSocketChannelImpl::didReceiveFlowControl(WebSocketHandle* handle, int64_t quota)
-{
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p didReceiveFlowControl(%p, %ld)", this, handle, static_cast<long>(quota));
-
-    ASSERT(m_handle);
-    ASSERT(handle == m_handle);
-
-    m_sendingQuota += quota;
-    sendInternal();
-}
-
-void NewWebSocketChannelImpl::didStartClosingHandshake(WebSocketHandle* handle)
-{
-    WTF_LOG(Network, "NewWebSocketChannelImpl %p didStartClosingHandshake(%p)", this, handle);
-
-    ASSERT(m_handle);
-    ASSERT(handle == m_handle);
-
-    if (m_client)
-        m_client->didStartClosingHandshake();
-}
-
-void NewWebSocketChannelImpl::didFinishLoadingBlob(PassRefPtr<ArrayBuffer> buffer)
-{
-    m_blobLoader.clear();
-    ASSERT(m_handle);
-    // The loaded blob is always placed on m_messages[0].
-    ASSERT(m_messages.size() > 0 && m_messages.first()->type == MessageTypeBlob);
-    // We replace it with the loaded blob.
-    m_messages.first() = adoptPtr(new Message(buffer));
-    sendInternal();
-}
-
-void NewWebSocketChannelImpl::didFailLoadingBlob(FileError::ErrorCode errorCode)
-{
-    m_blobLoader.clear();
-    if (errorCode == FileError::ABORT_ERR) {
-        // The error is caused by cancel().
-        return;
-    }
-    // FIXME: Generate human-friendly reason message.
-    failAsError("Failed to load Blob: error code = " + String::number(errorCode));
-    // |this| can be deleted here.
-}
-
-void NewWebSocketChannelImpl::trace(Visitor* visitor)
-{
-    visitor->trace(m_blobLoader);
-    visitor->trace(m_client);
-    WebSocketChannel::trace(visitor);
-}
-
-} // namespace blink