From 08d4a74d56ca431877819fc4566e27eafe150342 Mon Sep 17 00:00:00 2001 From: Simon Hausmann Date: Tue, 24 Jul 2012 17:03:20 +0200 Subject: Imported WebKit commit 0fbd41c4e13f5a190faf160bf993eee614e6e18e (http://svn.webkit.org/repository/webkit/trunk@123477) New snapshot that adapts to latest Qt API changes --- Source/WebKit/chromium/tests/CCLayerIteratorTest.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'Source/WebKit/chromium/tests/CCLayerIteratorTest.cpp') diff --git a/Source/WebKit/chromium/tests/CCLayerIteratorTest.cpp b/Source/WebKit/chromium/tests/CCLayerIteratorTest.cpp index 86a374325..76dc425aa 100644 --- a/Source/WebKit/chromium/tests/CCLayerIteratorTest.cpp +++ b/Source/WebKit/chromium/tests/CCLayerIteratorTest.cpp @@ -58,7 +58,8 @@ private: , m_drawsContent(true) { setBounds(IntSize(100, 100)); - setDrawableContentRect(IntRect(0, 0, 100, 100)); + setPosition(IntPoint::zero()); + setAnchorPoint(IntPoint::zero()); } bool m_drawsContent; @@ -239,6 +240,7 @@ TEST(CCLayerIteratorTest, complexTreeMultiSurface) RefPtr root231 = TestLayerChromium::create(); rootLayer->createRenderSurface(); + rootLayer->renderSurface()->setContentRect(IntRect(IntPoint(), rootLayer->bounds())); rootLayer->addChild(root1); rootLayer->addChild(root2); @@ -256,6 +258,7 @@ TEST(CCLayerIteratorTest, complexTreeMultiSurface) Vector > renderSurfaceLayerList; Vector > layerList; renderSurfaceLayerList.append(rootLayer.get()); + CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer.get(), WebTransformationMatrix(), WebTransformationMatrix(), renderSurfaceLayerList, layerList, -- cgit v1.2.1