Remove root layer specialness in calculateDrawTransforms

cc/layer_tree_host_impl_unittest.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 
 #include "cc/layer_tree_host_impl.h"
 
 #include "base/command_line.h"
 #include "base/hash_tables.h"
@@ skipping 1769 matching lines @@
 }
 
 TEST_P(LayerTreeHostImplTest, viewportCovered)
 {
     m_hostImpl->initializeRenderer(createContext());
     m_hostImpl->setBackgroundColor(SK_ColorGRAY);
 
     IntSize viewportSize(1000, 1000);
     m_hostImpl->setViewportSize(viewportSize, viewportSize);
 
-    m_hostImpl->setRootLayer(BlendStateCheckLayer::create(1, m_hostImpl->resourceProvider()));
-    BlendStateCheckLayer* root = static_cast<BlendStateCheckLayer*>(m_hostImpl->rootLayer());
-    root->setExpectation(false, true);
-    root->setContentsOpaque(true);
+    m_hostImpl->setRootLayer(LayerImpl::create(1));
+    m_hostImpl->rootLayer()->addChild(BlendStateCheckLayer::create(2, m_hostImpl->resourceProvider()));
+    BlendStateCheckLayer* child = static_cast<BlendStateCheckLayer*>(m_hostImpl->rootLayer()->children()[0]);
+    child->setExpectation(false, false);
+    child->setContentsOpaque(true);
 
     // No gutter rects
     {
         IntRect layerRect(0, 0, 1000, 1000);
-        root->setPosition(layerRect.location());
-        root->setBounds(layerRect.size());
-        root->setContentBounds(layerRect.size());
-        root->setQuadRect(IntRect(IntPoint(), layerRect.size()));
-        root->setQuadVisibleRect(IntRect(IntPoint(), layerRect.size()));
+        child->setPosition(layerRect.location());
+        child->setBounds(layerRect.size());
+        child->setContentBounds(layerRect.size());
+        child->setQuadRect(IntRect(IntPoint(), layerRect.size()));
+        child->setQuadVisibleRect(IntRect(IntPoint(), layerRect.size()));
 
         LayerTreeHostImpl::FrameData frame;
         EXPECT_TRUE(m_hostImpl->prepareToDraw(frame));
         ASSERT_EQ(1u, frame.renderPasses.size());
 
         size_t numGutterQuads = 0;
         for (size_t i = 0; i < frame.renderPasses[0]->quadList().size(); ++i)
             numGutterQuads += (frame.renderPasses[0]->quadList()[i]->material() == DrawQuad::SolidColor) ? 1 : 0;
         EXPECT_EQ(0u, numGutterQuads);
         EXPECT_EQ(1u, frame.renderPasses[0]->quadList().size());
 
-        verifyQuadsExactlyCoverRect(frame.renderPasses[0]->quadList(), IntRect(-layerRect.location(), viewportSize));
+        verifyQuadsExactlyCoverRect(frame.renderPasses[0]->quadList(), IntRect(IntPoint::zero(), viewportSize));
         m_hostImpl->didDrawAllLayers(frame);
     }
 
     // Empty visible content area (fullscreen gutter rect)
     {
         IntRect layerRect(0, 0, 0, 0);
-        root->setPosition(layerRect.location());
-        root->setBounds(layerRect.size());
-        root->setContentBounds(layerRect.size());
-        root->setQuadRect(IntRect(IntPoint(), layerRect.size()));
-        root->setQuadVisibleRect(IntRect(IntPoint(), layerRect.size()));
+        child->setPosition(layerRect.location());
+        child->setBounds(layerRect.size());
+        child->setContentBounds(layerRect.size());
+        child->setQuadRect(IntRect(IntPoint(), layerRect.size()));
+        child->setQuadVisibleRect(IntRect(IntPoint(), layerRect.size()));
 
         LayerTreeHostImpl::FrameData frame;
         EXPECT_TRUE(m_hostImpl->prepareToDraw(frame));
         ASSERT_EQ(1u, frame.renderPasses.size());
         m_hostImpl->didDrawAllLayers(frame);
 
         size_t numGutterQuads = 0;
         for (size_t i = 0; i < frame.renderPasses[0]->quadList().size(); ++i)
             numGutterQuads += (frame.renderPasses[0]->quadList()[i]->material() == DrawQuad::SolidColor) ? 1 : 0;
         EXPECT_EQ(1u, numGutterQuads);
         EXPECT_EQ(1u, frame.renderPasses[0]->quadList().size());
 
-        verifyQuadsExactlyCoverRect(frame.renderPasses[0]->quadList(), IntRect(-layerRect.location(), viewportSize));
+        verifyQuadsExactlyCoverRect(frame.renderPasses[0]->quadList(), IntRect(IntPoint::zero(), viewportSize));
         m_hostImpl->didDrawAllLayers(frame);
     }
 
     // Content area in middle of clip rect (four surrounding gutter rects)
     {
         IntRect layerRect(500, 500, 200, 200);
-        root->setPosition(layerRect.location());
-        root->setBounds(layerRect.size());
-        root->setContentBounds(layerRect.size());
-        root->setQuadRect(IntRect(IntPoint(), layerRect.size()));
-        root->setQuadVisibleRect(IntRect(IntPoint(), layerRect.size()));
+        child->setPosition(layerRect.location());
+        child->setBounds(layerRect.size());
+        child->setContentBounds(layerRect.size());
+        child->setQuadRect(IntRect(IntPoint(), layerRect.size()));
+        child->setQuadVisibleRect(IntRect(IntPoint(), layerRect.size()));
 
         LayerTreeHostImpl::FrameData frame;
         EXPECT_TRUE(m_hostImpl->prepareToDraw(frame));
         ASSERT_EQ(1u, frame.renderPasses.size());
 
         size_t numGutterQuads = 0;
         for (size_t i = 0; i < frame.renderPasses[0]->quadList().size(); ++i)
             numGutterQuads += (frame.renderPasses[0]->quadList()[i]->material() == DrawQuad::SolidColor) ? 1 : 0;
         EXPECT_EQ(4u, numGutterQuads);
         EXPECT_EQ(5u, frame.renderPasses[0]->quadList().size());
 
-        verifyQuadsExactlyCoverRect(frame.renderPasses[0]->quadList(), IntRect(-layerRect.location(), viewportSize));
+        verifyQuadsExactlyCoverRect(frame.renderPasses[0]->quadList(), IntRect(IntPoint::zero(), viewportSize));
         m_hostImpl->didDrawAllLayers(frame);
     }
 
 }
 
 
 class ReshapeTrackerContext: public FakeWebGraphicsContext3D {
 public:
     ReshapeTrackerContext() : m_reshapeCalled(false) { }
 
@@ skipping 2504 matching lines @@
         verifyRenderPassTestData(removeRenderPassesCases[testCaseIndex], testData);
         testCaseIndex++;
     }
 }
 
 INSTANTIATE_TEST_CASE_P(LayerTreeHostImplTests,
                         LayerTreeHostImplTest,
                         ::testing::Values(false, true));
 
 } // namespace