Imported WebKit commit 8d6c5efc74f0222dfc7bcce8d845d4a2707ed9e6 (http://svn.webkit.org/repository/webkit/trunk@118629)

1 files changed, 10 insertions, 17 deletions

diff --git a/Source/WebKit/chromium/src/WebLayerTreeViewImpl.h b/Source/WebKit/chromium/src/WebLayerTreeViewImpl.h
index f854b7e60..1184342e8 100644
--- a/Source/WebKit/chromium/src/WebLayerTreeViewImpl.h
+++ b/Source/WebKit/chromium/src/WebLayerTreeViewImpl.h
@@ -27,37 +27,30 @@
 #define WebLayerTreeViewImpl_h
 
 #include "platform/WebLayerTreeView.h"
-#include "cc/CCLayerTreeHost.h"
+#include <wtf/OwnPtr.h>
 #include <wtf/PassOwnPtr.h>
 
+namespace WebCore {
+class CCLayerTreeHost;
+}
+
 namespace WebKit {
 class WebLayer;
 class WebLayerTreeViewClient;
+class WebLayerTreeViewClientAdapter;
 
-class WebLayerTreeViewImpl : public WebCore::CCLayerTreeHost, public WebCore::CCLayerTreeHostClient {
+class WebLayerTreeViewImpl {
 public:
     static PassOwnPtr<WebLayerTreeViewImpl> create(WebLayerTreeViewClient*, const WebLayer& root, const WebLayerTreeView::Settings&);
     virtual ~WebLayerTreeViewImpl();
 
-    virtual void willBeginFrame() OVERRIDE;
-    virtual void didBeginFrame() OVERRIDE;
-    virtual void updateAnimations(double monotonicFrameBeginTime) OVERRIDE;
-    virtual void layout() OVERRIDE;
-    virtual void applyScrollAndScale(const WebCore::IntSize& scrollDelta, float pageScale) OVERRIDE;
-    virtual PassRefPtr<WebCore::GraphicsContext3D> createContext() OVERRIDE;
-    virtual void didRecreateContext(bool success) OVERRIDE;
-    virtual void willCommit() OVERRIDE;
-    virtual void didCommit() OVERRIDE;
-    virtual void didCommitAndDrawFrame() OVERRIDE;
-    virtual void didCompleteSwapBuffers() OVERRIDE;
-
-    // Only used in the single threaded path.
-    virtual void scheduleComposite() OVERRIDE;
+    WebCore::CCLayerTreeHost* layerTreeHost() { return m_layerTreeHost.get(); }
 
 private:
     WebLayerTreeViewImpl(WebLayerTreeViewClient*, const WebLayerTreeView::Settings&);
 
-    WebLayerTreeViewClient* m_client;
+    OwnPtr<WebLayerTreeViewClientAdapter> m_clientAdapter;
+    OwnPtr<WebCore::CCLayerTreeHost> m_layerTreeHost;
 };
 
 } // namespace WebKit