Imported WebKit commit 0282df8ca7c11d8c8a66ea18543695c69f545a27 (http://svn.webkit.org/repository/webkit/trunk@124002)

New snapshot with prospective Mountain Lion build fix

1 files changed, 2 insertions, 10 deletions

diff --git a/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp b/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp
index b559db12c..596b0692c 100644
--- a/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp
+++ b/Source/WebKit/chromium/tests/CCOcclusionTrackerTest.cpp
@@ -256,16 +256,12 @@ protected:
     void calcDrawEtc(TestContentLayerImpl* root)
     {
         ASSERT(root == m_root.get());
-        Vector<CCLayerImpl*> dummyLayerList;
         int dummyMaxTextureSize = 512;
         CCLayerSorter layerSorter;
 
         ASSERT(!root->renderSurface());
-        root->createRenderSurface();
-        root->renderSurface()->setContentRect(IntRect(IntPoint::zero(), root->bounds()));
-        m_renderSurfaceLayerListImpl.append(m_root.get());
 
-        CCLayerTreeHostCommon::calculateDrawTransforms(root, root, identityMatrix, identityMatrix, m_renderSurfaceLayerListImpl, dummyLayerList, &layerSorter, dummyMaxTextureSize);
+        CCLayerTreeHostCommon::calculateDrawTransforms(root, root->bounds(), 1, &layerSorter, dummyMaxTextureSize, m_renderSurfaceLayerListImpl);
 
         CCLayerTreeHostCommon::calculateVisibleAndScissorRects(m_renderSurfaceLayerListImpl, root->renderSurface()->contentRect());
 
@@ -275,15 +271,11 @@ protected:
     void calcDrawEtc(TestContentLayerChromium* root)
     {
         ASSERT(root == m_root.get());
-        Vector<RefPtr<LayerChromium> > dummyLayerList;
         int dummyMaxTextureSize = 512;
 
         ASSERT(!root->renderSurface());
-        root->createRenderSurface();
-        root->renderSurface()->setContentRect(IntRect(IntPoint::zero(), root->bounds()));
-        m_renderSurfaceLayerListChromium.append(m_root);
 
-        CCLayerTreeHostCommon::calculateDrawTransforms(root, root, identityMatrix, identityMatrix, m_renderSurfaceLayerListChromium, dummyLayerList, dummyMaxTextureSize);
+        CCLayerTreeHostCommon::calculateDrawTransforms(root, root->bounds(), 1, dummyMaxTextureSize, m_renderSurfaceLayerListChromium);
 
         CCLayerTreeHostCommon::calculateVisibleAndScissorRects(m_renderSurfaceLayerListChromium, root->renderSurface()->contentRect());