Decouple WebSocketChannelClient from WebSocketImpl

Source/web/WebSocketChannelClientProxy.h

Index: Source/web/WebSocketChannelClientProxy.h
diff --git a/Source/web/WebSocketChannelClientProxy.h b/Source/web/WebSocketChannelClientProxy.h
new file mode 100644
index 0000000000000000000000000000000000000000..b2fa1cd48c0d92d1f9c2d018689ec865fc20af1e
--- /dev/null
+++ b/Source/web/WebSocketChannelClientProxy.h
@@ -0,0 +1,72 @@
+// 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.
+
+#ifndef WebSocketChannelClientProxy_h
+#define WebSocketChannelClientProxy_h
+
+#include "modules/websockets/WebSocketChannelClient.h"
+#include "platform/heap/Handle.h"
+#include "web/WebSocketImpl.h"
+#include "wtf/PassOwnPtr.h"
+#include "wtf/Vector.h"
+#include "wtf/text/WTFString.h"
+
+namespace blink {
+
+// Ideally we want to simply make WebSocketImpl inherit from
+// WebSocketChannelClient, but we cannot do that because WebSocketChannelClient
+// needs to be on Oilpan's heap whereas WebSocketImpl cannot be on Oilpan's
+// heap. Thus we need to introduce a proxy class to decouple WebSocketImpl
+// from WebSocketChannelClient.
+class WebSocketChannelClientProxy FINAL : public NoBaseWillBeGarbageCollectedFinalized<WebSocketChannelClientProxy>, public blink::WebSocketChannelClient {
+    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(WebSocketChannelClientProxy)
+public:
+    static PassOwnPtrWillBeRawPtr<WebSocketChannelClientProxy> create(WebSocketImpl* impl)
+    {
+        return adoptPtrWillBeNoop(new WebSocketChannelClientProxy(impl));
+    }
+
+    virtual void didConnect(const String& subprotocol, const String& extensions) OVERRIDE
+    {
+        m_impl->didConnect(subprotocol, extensions);
+    }
+    virtual void didReceiveMessage(const String& message) OVERRIDE
+    {
+        m_impl->didReceiveMessage(message);
+    }
+    virtual void didReceiveBinaryData(PassOwnPtr<Vector<char> > binaryData) OVERRIDE
+    {
+        m_impl->didReceiveBinaryData(binaryData);
+    }
+    virtual void didReceiveMessageError() OVERRIDE
+    {
+        m_impl->didReceiveMessageError();
+    }
+    virtual void didConsumeBufferedAmount(unsigned long consumed) OVERRIDE
+    {
+        m_impl->didConsumeBufferedAmount(consumed);
+    }
+    virtual void didStartClosingHandshake() OVERRIDE
+    {
+        m_impl->didStartClosingHandshake();
+    }
+    virtual void didClose(ClosingHandshakeCompletionStatus status, unsigned short code, const String& reason) OVERRIDE
+    {
+        WebSocketImpl* impl = m_impl;
+        m_impl = nullptr;
+        impl->didClose(status, code, reason);
+    }
+
+private:
+    explicit WebSocketChannelClientProxy(WebSocketImpl* impl)
+        : m_impl(impl)
+    {
+    }
+
+    WebSocketImpl* m_impl;
+};
+
+} // namespace blink
+
+#endif // WebSocketChannelClientProxy_h