Decouple WebSocketChannelClient from WebSocketImpl

Source/web/WebSocketImpl.cpp

 /*
  * Copyright (C) 2011, 2012 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
@@ skipping 23 matching lines @@
 #include "core/dom/Document.h"
 #include "core/frame/ConsoleTypes.h"
 #include "modules/websockets/MainThreadWebSocketChannel.h"
 #include "modules/websockets/NewWebSocketChannelImpl.h"
 #include "modules/websockets/WebSocketChannel.h"
 #include "platform/RuntimeEnabledFeatures.h"
 #include "public/platform/WebArrayBuffer.h"
 #include "public/platform/WebString.h"
 #include "public/platform/WebURL.h"
 #include "public/web/WebDocument.h"
+#include "web/WebSocketChannelClientProxy.h"
 #include "wtf/ArrayBuffer.h"
 #include "wtf/text/CString.h"
 #include "wtf/text/WTFString.h"
 
 using namespace blink;
 
 namespace blink {
 
 WebSocketImpl::WebSocketImpl(const WebDocument& document, WebSocketClient* client)
     : m_client(client)
+    , m_channelProxy(WebSocketChannelClientProxy::create(this))
     , m_binaryType(BinaryTypeBlob)
     , m_isClosingOrClosed(false)
     , m_bufferedAmount(0)
     , m_bufferedAmountAfterClose(0)
 {
     RefPtrWillBeRawPtr<Document> coreDocument = PassRefPtrWillBeRawPtr<Document>(document);
     if (RuntimeEnabledFeatures::experimentalWebSocketEnabled()) {
-        m_private = NewWebSocketChannelImpl::create(coreDocument.get(), this);
+        m_private = NewWebSocketChannelImpl::create(coreDocument.get(), m_channelProxy.get());
     } else {
-        m_private = MainThreadWebSocketChannel::create(coreDocument.get(), this);
+        m_private = MainThreadWebSocketChannel::create(coreDocument.get(), m_channelProxy.get());
     }
 }
 
 WebSocketImpl::~WebSocketImpl()
 {
 #if !ENABLE(OILPAN)

[yhirano, 2014/08/04 01:05:53]

WebSocketImpl is not on heap any more, so we can remove this macro.

[haraken, 2014/08/04 01:21:57]

Done.

     m_private->disconnect();
 #endif
 }
 
 WebSocket::BinaryType WebSocketImpl::binaryType() const
 {
     return m_binaryType;
 }
 
 bool WebSocketImpl::setBinaryType(BinaryType binaryType)
@@ skipping 114 matching lines @@
     // FIXME: Deprecate the following statements.
     m_bufferedAmount -= consumed;
     m_client->didUpdateBufferedAmount(m_bufferedAmount);
 }
 
 void WebSocketImpl::didStartClosingHandshake()
 {
     m_client->didStartClosingHandshake();
 }
 
-void WebSocketImpl::didClose(ClosingHandshakeCompletionStatus status, unsigned short code, const String& reason)
+void WebSocketImpl::didClose(WebSocketChannelClient::ClosingHandshakeCompletionStatus status, unsigned short code, const String& reason)
 {
     m_isClosingOrClosed = true;
     m_client->didClose(static_cast<WebSocketClient::ClosingHandshakeCompletionStatus>(status), code, WebString(reason));
 
     // FIXME: Deprecate this call.
     m_client->didClose(m_bufferedAmount - m_bufferedAmountAfterClose, static_cast<WebSocketClient::ClosingHandshakeCompletionStatus>(status), code, WebString(reason));
 }
 
-void WebSocketImpl::trace(blink::Visitor* visitor)
-{
-    visitor->trace(m_private);
-    blink::WebSocketChannelClient::trace(visitor);
-}
-
 } // namespace blink