summaryrefslogtreecommitdiff
path: root/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp
diff options
context:
space:
mode:
authorSimon Hausmann <simon.hausmann@nokia.com>2012-06-27 09:28:46 +0200
committerSimon Hausmann <simon.hausmann@nokia.com>2012-06-27 09:28:46 +0200
commit6668b07fcd51f86be243b9e08e667224e30c0cf8 (patch)
tree64f466e09b68a77ae1156c0d35cd5b95e18a34ca /Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp
parente7923d9de38974f0c6fb7646c898a6ea618261e8 (diff)
downloadqtwebkit-6668b07fcd51f86be243b9e08e667224e30c0cf8.tar.gz
Imported WebKit commit 26cd9bd8ab0471ffe987c9b60368f63dc0f1f31b (http://svn.webkit.org/repository/webkit/trunk@121325)
New snapshot with more Windows build fixes
Diffstat (limited to 'Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp')
-rw-r--r--Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp b/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp
index 410c45d78..1979d935c 100644
--- a/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp
+++ b/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp
@@ -27,7 +27,7 @@
#include "GraphicsLayerChromium.h"
#include "CCAnimationTestCommon.h"
-#include "CompositorFakeGraphicsContext3D.h"
+#include "CompositorFakeWebGraphicsContext3D.h"
#include "GraphicsContext3D.h"
#include "GraphicsContext3DPrivate.h"
#include "GraphicsLayer.h"
@@ -42,6 +42,7 @@
#include "cc/CCSingleThreadProxy.h"
#include <gtest/gtest.h>
+#include <public/WebGraphicsContext3D.h>
#include <wtf/PassOwnPtr.h>
using namespace WebCore;
@@ -67,10 +68,9 @@ public:
virtual void updateAnimations(double frameBeginTime) OVERRIDE { }
virtual void layout() OVERRIDE { }
virtual void applyScrollAndScale(const IntSize& scrollDelta, float pageScale) OVERRIDE { }
- virtual PassRefPtr<GraphicsContext3D> createContext3D() OVERRIDE
+ virtual PassOwnPtr<WebGraphicsContext3D> createContext3D() OVERRIDE
{
- GraphicsContext3D::Attributes attrs;
- return createCompositorMockGraphicsContext3D(attrs);
+ return CompositorFakeWebGraphicsContext3D::create(WebGraphicsContext3D::Attributes());
}
virtual void didRecreateContext(bool success) OVERRIDE { }
virtual void willCommit() OVERRIDE { }