Decouple WebSocketChannelClient from WebSocketImpl

Source/web/WebSocketImpl.h

 /*
  * 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 22 matching lines @@
 
 #include "modules/websockets/WebSocketChannelClient.h"
 #include "platform/heap/Handle.h"
 #include "public/platform/WebCommon.h"
 #include "public/platform/WebString.h"
 #include "public/web/WebSocket.h"
 #include "public/web/WebSocketClient.h"
 #include "wtf/OwnPtr.h"
 #include "wtf/RefPtr.h"
 
-namespace blink { class WebSocketChannel; }
-
 namespace blink {
 
 class WebDocument;
+class WebSocketChannelClientProxy;
 class WebURL;

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

+class WebSocketChannel;

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

Done.

 
-class WebSocketImpl FINAL : public NoBaseWillBeGarbageCollectedFinalized<WebSocketImpl>, public WebSocket, public blink::WebSocketChannelClient {
-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(WebSocketImpl)
+class WebSocketImpl FINAL : public WebSocket {
 public:
     WebSocketImpl(const WebDocument&, WebSocketClient*);
     virtual ~WebSocketImpl();
 
     bool isNull() const { return !m_private; }
 
     virtual BinaryType binaryType() const OVERRIDE;
     virtual bool setBinaryType(BinaryType) OVERRIDE;
     virtual void connect(const WebURL&, const WebString& protocol) OVERRIDE;
     virtual WebString subprotocol() OVERRIDE;
     virtual WebString extensions() OVERRIDE;
     virtual bool sendText(const WebString&) OVERRIDE;
     virtual bool sendArrayBuffer(const WebArrayBuffer&) OVERRIDE;
     virtual unsigned long bufferedAmount() const OVERRIDE;
     virtual void close(int code, const WebString& reason) OVERRIDE;
     virtual void fail(const WebString& reason) OVERRIDE;
     virtual void disconnect() OVERRIDE;
 
-    // WebSocketChannelClient
-    virtual void didConnect(const String& subprotocol, const String& extensions) OVERRIDE;
-    virtual void didReceiveMessage(const String& message) OVERRIDE;
-    virtual void didReceiveBinaryData(PassOwnPtr<Vector<char> > binaryData) OVERRIDE;
-    virtual void didReceiveMessageError() OVERRIDE;
-    virtual void didConsumeBufferedAmount(unsigned long consumed) OVERRIDE;
-    virtual void didStartClosingHandshake() OVERRIDE;
-    virtual void didClose(ClosingHandshakeCompletionStatus, unsigned short code, const String& reason) OVERRIDE;
-
-    virtual void trace(blink::Visitor*) OVERRIDE;
+    // WebSocketChannelClient methods proxied by WebSocketChannelClientProxy.
+    void didConnect(const String& subprotocol, const String& extensions);
+    void didReceiveMessage(const String& message);
+    void didReceiveBinaryData(PassOwnPtr<Vector<char> > binaryData);
+    void didReceiveMessageError();
+    void didConsumeBufferedAmount(unsigned long consumed);
+    void didStartClosingHandshake();
+    void didClose(WebSocketChannelClient::ClosingHandshakeCompletionStatus, unsigned short code, const String& reason);
 
 private:
-    RefPtrWillBeMember<blink::WebSocketChannel> m_private;
+    RefPtrWillBePersistent<blink::WebSocketChannel> m_private;
     WebSocketClient* m_client;
+    OwnPtrWillBePersistent<WebSocketChannelClientProxy> m_channelProxy;
     BinaryType m_binaryType;
     WebString m_subprotocol;
     WebString m_extensions;
     bool m_isClosingOrClosed;
     // m_bufferedAmount includes m_bufferedAmountAfterClose.
     unsigned long m_bufferedAmount;
     unsigned long m_bufferedAmountAfterClose;
 };
 
 } // namespace blink
 
 #endif // WebWebSocketChannelImpl_h