diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-08-12 09:27:39 +0200 |
| commit | 3749d61e1f7a59f5ec5067e560af1eb610c82015 (patch) | |
| tree | 73dc228333948738bbe02976cacca8cd382bc978 /Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp | |
| parent | b32b4dcd9a51ab8de6afc53d9e17f8707e1f7a5e (diff) | |
| download | qtwebkit-3749d61e1f7a59f5ec5067e560af1eb610c82015.tar.gz | |
Imported WebKit commit a77350243e054f3460d1137301d8b3faee3d2052 (http://svn.webkit.org/repository/webkit/trunk@125365)
New snapshot with build fixes for latest API changes in Qt and all WK1 Win MSVC fixes upstream
Diffstat (limited to 'Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp')
| -rw-r--r-- | Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp b/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp index 91aeb7ca5..21d0705b8 100644 --- a/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp +++ b/Source/WebKit/chromium/tests/GraphicsLayerChromiumTest.cpp @@ -36,11 +36,10 @@ #include "Matrix3DTransformOperation.h" #include "RotateTransformOperation.h" #include "TranslateTransformOperation.h" -#include "WebCompositor.h" - #include "cc/CCLayerTreeHost.h" #include "cc/CCLayerTreeHostImpl.h" #include "cc/CCSingleThreadProxy.h" +#include <public/WebCompositor.h> #include <gtest/gtest.h> #include <public/WebGraphicsContext3D.h> @@ -71,7 +70,7 @@ public: bool success = layerTreeHost->initialize(); EXPECT_TRUE(success); layerTreeHost->setRootLayer(LayerChromium::create()); - layerTreeHost->setViewportSize(IntSize(1, 1)); + layerTreeHost->setViewportSize(IntSize(1, 1), IntSize(1, 1)); return layerTreeHost.release(); } @@ -95,7 +94,7 @@ public: WebCompositor::setAcceleratedAnimationEnabled(true); WebCompositor::initialize(0); m_graphicsLayer = static_pointer_cast<GraphicsLayerChromium>(GraphicsLayer::create(&m_client)); - m_platformLayer = static_cast<LayerChromium*>(m_graphicsLayer->platformLayer()); + m_platformLayer = m_graphicsLayer->platformLayer()->unwrap<LayerChromium>(); m_layerTreeHost = MockLayerTreeHost::create(); m_platformLayer->setLayerTreeHost(m_layerTreeHost.get()); } @@ -133,7 +132,7 @@ TEST_F(GraphicsLayerChromiumTest, updateLayerPreserves3DWithAnimations) m_graphicsLayer->setPreserves3D(true); - m_platformLayer = static_cast<LayerChromium*>(m_graphicsLayer->platformLayer()); + m_platformLayer = m_graphicsLayer->platformLayer()->unwrap<LayerChromium>(); ASSERT_TRUE(m_platformLayer); ASSERT_TRUE(m_platformLayer->hasActiveAnimation()); @@ -142,7 +141,7 @@ TEST_F(GraphicsLayerChromiumTest, updateLayerPreserves3DWithAnimations) m_graphicsLayer->setPreserves3D(false); - m_platformLayer = static_cast<LayerChromium*>(m_graphicsLayer->platformLayer()); + m_platformLayer = m_graphicsLayer->platformLayer()->unwrap<LayerChromium>(); ASSERT_TRUE(m_platformLayer); ASSERT_FALSE(m_platformLayer->hasActiveAnimation()); |