From 6668b07fcd51f86be243b9e08e667224e30c0cf8 Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Wed, 27 Jun 2012 09:28:46 +0200
Subject: Imported WebKit commit 26cd9bd8ab0471ffe987c9b60368f63dc0f1f31b
 (http://svn.webkit.org/repository/webkit/trunk@121325)

New snapshot with more Windows build fixes
---
 Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp')

diff --git a/Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp b/Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp
index 17d5fe867..825fc01ef 100644
--- a/Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp
+++ b/Source/WebKit/chromium/src/WebLayerTreeViewImpl.cpp
@@ -54,12 +54,9 @@ public:
     virtual void updateAnimations(double monotonicFrameBeginTime) OVERRIDE { m_client->updateAnimations(monotonicFrameBeginTime); }
     virtual void layout() OVERRIDE { m_client->layout(); }
     virtual void applyScrollAndScale(const WebCore::IntSize& scrollDelta, float pageScale) OVERRIDE { m_client->applyScrollAndScale(scrollDelta, pageScale); }
-    virtual PassRefPtr<WebCore::GraphicsContext3D> createContext3D() OVERRIDE
+    virtual PassOwnPtr<WebGraphicsContext3D> createContext3D() OVERRIDE
     {
-        OwnPtr<WebGraphicsContext3D> webContext = adoptPtr(m_client->createContext3D());
-        if (!webContext)
-            return 0;
-        return GraphicsContext3DPrivate::createGraphicsContextFromWebContext(webContext.release(), GraphicsContext3D::RenderDirectlyToHostWindow, false /* preserveDrawingBuffer */ );
+        return adoptPtr(m_client->createContext3D());
     }
     virtual void didRecreateContext(bool success) OVERRIDE { m_client->didRebindGraphicsContext(success); }
     virtual void willCommit() OVERRIDE { m_client->willCommit(); }
-- 
cgit v1.2.1