Organize internal properties of cc/ layer types

cc/layer_iterator_unittest.cc

 // Copyright 2012 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 "cc/layer_iterator.h"
 
 #include "cc/layer.h"
 #include "cc/layer_tree_host_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
@@ skipping 109 matching lines @@
     scoped_refptr<TestLayer> fourth = TestLayer::create();
 
     rootLayer->createRenderSurface();
 
     rootLayer->addChild(first);
     rootLayer->addChild(second);
     rootLayer->addChild(third);
     rootLayer->addChild(fourth);
 
     std::vector<scoped_refptr<Layer> > renderSurfaceLayerList;
-    LayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer->bounds(), 1, 1, 256, renderSurfaceLayerList);
+    LayerTreeHostCommon::calculateDrawProperties(rootLayer.get(), rootLayer->bounds(), 1, 1, 256, renderSurfaceLayerList);
 
     iterateBackToFront(&renderSurfaceLayerList);
     EXPECT_COUNT(rootLayer, 0, -1, 1);
     EXPECT_COUNT(first, -1, -1, 2);
     EXPECT_COUNT(second, -1, -1, 3);
     EXPECT_COUNT(third, -1, -1, 4);
     EXPECT_COUNT(fourth, -1, -1, 5);
 
     iterateFrontToBack(&renderSurfaceLayerList);
     EXPECT_COUNT(rootLayer, 5, -1, 4);
@@ skipping 21 matching lines @@
     rootLayer->addChild(root1);
     rootLayer->addChild(root2);
     rootLayer->addChild(root3);
     root2->addChild(root21);
     root2->addChild(root22);
     root2->addChild(root23);
     root22->addChild(root221);
     root23->addChild(root231);
 
     std::vector<scoped_refptr<Layer> > renderSurfaceLayerList;
-    LayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer->bounds(), 1, 1, 256, renderSurfaceLayerList);
+    LayerTreeHostCommon::calculateDrawProperties(rootLayer.get(), rootLayer->bounds(), 1, 1, 256, renderSurfaceLayerList);
 
     iterateBackToFront(&renderSurfaceLayerList);
     EXPECT_COUNT(rootLayer, 0, -1, 1);
     EXPECT_COUNT(root1, -1, -1, 2);
     EXPECT_COUNT(root2, -1, -1, 3);
     EXPECT_COUNT(root21, -1, -1, 4);
     EXPECT_COUNT(root22, -1, -1, 5);
     EXPECT_COUNT(root221, -1, -1, 6);
     EXPECT_COUNT(root23, -1, -1, 7);
     EXPECT_COUNT(root231, -1, -1, 8);
@@ skipping 35 matching lines @@
     root2->setForceRenderSurface(true); // Force the layer to own a new surface.
     root2->addChild(root21);
     root2->addChild(root22);
     root2->addChild(root23);
     root22->setOpacity(0.5);
     root22->addChild(root221);
     root23->setOpacity(0.5);
     root23->addChild(root231);
 
     std::vector<scoped_refptr<Layer> > renderSurfaceLayerList;
-    LayerTreeHostCommon::calculateDrawTransforms(rootLayer.get(), rootLayer->bounds(), 1, 1, 256, renderSurfaceLayerList);
+    LayerTreeHostCommon::calculateDrawProperties(rootLayer.get(), rootLayer->bounds(), 1, 1, 256, renderSurfaceLayerList);
 
     iterateBackToFront(&renderSurfaceLayerList);
     EXPECT_COUNT(rootLayer, 0, -1, 1);
     EXPECT_COUNT(root1, -1, -1, 2);
     EXPECT_COUNT(root2, 4, 3, -1);
     EXPECT_COUNT(root21, -1, -1, 5);
     EXPECT_COUNT(root22, 7, 6, 8);
     EXPECT_COUNT(root221, -1, -1, 9);
     EXPECT_COUNT(root23, 11, 10, 12);
     EXPECT_COUNT(root231, -1, -1, 13);
     EXPECT_COUNT(root3, -1, -1, 14);
 
     iterateFrontToBack(&renderSurfaceLayerList);
     EXPECT_COUNT(rootLayer, 14, -1, 13);
     EXPECT_COUNT(root1, -1, -1, 12);
     EXPECT_COUNT(root2, 10, 11, -1);
     EXPECT_COUNT(root21, -1, -1, 9);
     EXPECT_COUNT(root22, 7, 8, 6);
     EXPECT_COUNT(root221, -1, -1, 5);
     EXPECT_COUNT(root23, 3, 4, 2);
     EXPECT_COUNT(root231, -1, -1, 1);
     EXPECT_COUNT(root3, -1, -1, 0);
 }
 
 }  // namespace
 }  // namespace cc