From 89e2486a48b739f8d771d69ede5a6a1b244a10fc Mon Sep 17 00:00:00 2001
From: Simon Hausmann <simon.hausmann@nokia.com>
Date: Mon, 30 Jul 2012 11:37:48 +0200
Subject: Imported WebKit commit 0282df8ca7c11d8c8a66ea18543695c69f545a27
 (http://svn.webkit.org/repository/webkit/trunk@124002)

New snapshot with prospective Mountain Lion build fix
---
 .../WebKit/chromium/tests/CCLayerIteratorTest.cpp  | 22 +++-------------------
 1 file changed, 3 insertions(+), 19 deletions(-)

(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 76dc425aa..73fda4cb4 100644
--- a/Source/WebKit/chromium/tests/CCLayerIteratorTest.cpp
+++ b/Source/WebKit/chromium/tests/CCLayerIteratorTest.cpp
@@ -147,12 +147,7 @@ TEST(CCLayerIteratorTest, simpleTree)
     rootLayer->addChild(fourth);
 
     Vector<RefPtr<LayerChromium> > renderSurfaceLayerList;
-    Vector<RefPtr<LayerChromium> > layerList;
-    renderSurfaceLayerList.append(rootLayer.get());
-    CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer.get(),
-                                                   WebTransformationMatrix(), WebTransformationMatrix(),
-                                                   renderSurfaceLayerList, layerList,
-                                                   256);
+    CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer->bounds(), 1, 256, renderSurfaceLayerList);
     CCLayerTreeHostCommon::calculateVisibleAndScissorRects(renderSurfaceLayerList, rootLayer->renderSurface()->contentRect());
 
     iterateBackToFront(&renderSurfaceLayerList);
@@ -195,12 +190,7 @@ TEST(CCLayerIteratorTest, complexTree)
     root23->addChild(root231);
 
     Vector<RefPtr<LayerChromium> > renderSurfaceLayerList;
-    Vector<RefPtr<LayerChromium> > layerList;
-    renderSurfaceLayerList.append(rootLayer.get());
-    CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer.get(),
-                                                   WebTransformationMatrix(), WebTransformationMatrix(),
-                                                   renderSurfaceLayerList, layerList,
-                                                   256);
+    CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer->bounds(), 1, 256, renderSurfaceLayerList);
     CCLayerTreeHostCommon::calculateVisibleAndScissorRects(renderSurfaceLayerList, rootLayer->renderSurface()->contentRect());
 
     iterateBackToFront(&renderSurfaceLayerList);
@@ -256,13 +246,7 @@ TEST(CCLayerIteratorTest, complexTreeMultiSurface)
     root23->addChild(root231);
 
     Vector<RefPtr<LayerChromium> > renderSurfaceLayerList;
-    Vector<RefPtr<LayerChromium> > layerList;
-    renderSurfaceLayerList.append(rootLayer.get());
-    
-    CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer.get(),
-                                                   WebTransformationMatrix(), WebTransformationMatrix(),
-                                                   renderSurfaceLayerList, layerList,
-                                                   256);
+    CCLayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer->bounds(), 1, 256, renderSurfaceLayerList);
     CCLayerTreeHostCommon::calculateVisibleAndScissorRects(renderSurfaceLayerList, rootLayer->renderSurface()->contentRect());
 
     iterateBackToFront(&renderSurfaceLayerList);
-- 
cgit v1.2.1