CC: Plumb LayerSettings parameter for cc::Layer construction.

cc/layers/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/layers/layer_iterator.h"
 
 #include <vector>
 
 #include "cc/layers/layer.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/transform.h"
 
 using ::testing::Mock;
 using ::testing::_;
 using ::testing::AtLeast;
 using ::testing::AnyNumber;
 
 namespace cc {
 namespace {
 
 class TestLayer : public Layer {
  public:
-  static scoped_refptr<TestLayer> Create() {
-    return make_scoped_refptr(new TestLayer());
+  static scoped_refptr<TestLayer> Create(const LayerSettings& settings) {
+    return make_scoped_refptr(new TestLayer(settings));
   }
 
   int count_representing_target_surface_;
   int count_representing_contributing_surface_;
   int count_representing_itself_;
 
   bool DrawsContent() const override { return draws_content_; }
   void set_draws_content(bool draws_content) { draws_content_ = draws_content; }
 
  private:
-  TestLayer() : Layer(), draws_content_(true) {
+  explicit TestLayer(const LayerSettings& settings)
+      : Layer(settings), draws_content_(true) {
     SetBounds(gfx::Size(100, 100));
     SetPosition(gfx::Point());
   }
   ~TestLayer() override {}
 
   bool draws_content_;
 };
 
 #define EXPECT_COUNT(layer, target, contrib, itself)                           \
   EXPECT_EQ(target, layer->count_representing_target_surface_);                \
@@ skipping 44 matching lines @@
   }
 }
 
 TEST(LayerIteratorTest, EmptyTree) {
   RenderSurfaceLayerList render_surface_layer_list;
 
   IterateFrontToBack(&render_surface_layer_list);
 }
 
 TEST(LayerIteratorTest, SimpleTree) {
-  scoped_refptr<TestLayer> root_layer = TestLayer::Create();
-  scoped_refptr<TestLayer> first = TestLayer::Create();
-  scoped_refptr<TestLayer> second = TestLayer::Create();
-  scoped_refptr<TestLayer> third = TestLayer::Create();
-  scoped_refptr<TestLayer> fourth = TestLayer::Create();
+  LayerSettings settings;
+  scoped_refptr<TestLayer> root_layer = TestLayer::Create(settings);
+  scoped_refptr<TestLayer> first = TestLayer::Create(settings);
+  scoped_refptr<TestLayer> second = TestLayer::Create(settings);
+  scoped_refptr<TestLayer> third = TestLayer::Create(settings);
+  scoped_refptr<TestLayer> fourth = TestLayer::Create(settings);
 
   root_layer->AddChild(first);
   root_layer->AddChild(second);
   root_layer->AddChild(third);
   root_layer->AddChild(fourth);
 
   FakeLayerTreeHostClient client(FakeLayerTreeHostClient::DIRECT_3D);
   scoped_ptr<FakeLayerTreeHost> host = FakeLayerTreeHost::Create(&client);
   host->SetRootLayer(root_layer);
 
   RenderSurfaceLayerList render_surface_layer_list;
   LayerTreeHostCommon::CalcDrawPropsMainInputsForTesting inputs(
       root_layer.get(), root_layer->bounds(), &render_surface_layer_list);
   LayerTreeHostCommon::CalculateDrawProperties(&inputs);
 
   IterateFrontToBack(&render_surface_layer_list);
   EXPECT_COUNT(root_layer, 5, -1, 4);
   EXPECT_COUNT(first, -1, -1, 3);
   EXPECT_COUNT(second, -1, -1, 2);
   EXPECT_COUNT(third, -1, -1, 1);
   EXPECT_COUNT(fourth, -1, -1, 0);
 }
 
 TEST(LayerIteratorTest, ComplexTree) {
-  scoped_refptr<TestLayer> root_layer = TestLayer::Create();
-  scoped_refptr<TestLayer> root1 = TestLayer::Create();
-  scoped_refptr<TestLayer> root2 = TestLayer::Create();
-  scoped_refptr<TestLayer> root3 = TestLayer::Create();
-  scoped_refptr<TestLayer> root21 = TestLayer::Create();
-  scoped_refptr<TestLayer> root22 = TestLayer::Create();
-  scoped_refptr<TestLayer> root23 = TestLayer::Create();
-  scoped_refptr<TestLayer> root221 = TestLayer::Create();
-  scoped_refptr<TestLayer> root231 = TestLayer::Create();
+  LayerSettings settings;
+  scoped_refptr<TestLayer> root_layer = TestLayer::Create(settings);
+  scoped_refptr<TestLayer> root1 = TestLayer::Create(settings);
+  scoped_refptr<TestLayer> root2 = TestLayer::Create(settings);
+  scoped_refptr<TestLayer> root3 = TestLayer::Create(settings);
+  scoped_refptr<TestLayer> root21 = TestLayer::Create(settings);
+  scoped_refptr<TestLayer> root22 = TestLayer::Create(settings);
+  scoped_refptr<TestLayer> root23 = TestLayer::Create(settings);
+  scoped_refptr<TestLayer> root221 = TestLayer::Create(settings);
+  scoped_refptr<TestLayer> root231 = TestLayer::Create(settings);
 
   root_layer->AddChild(root1);
   root_layer->AddChild(root2);
   root_layer->AddChild(root3);
   root2->AddChild(root21);
   root2->AddChild(root22);
   root2->AddChild(root23);
   root22->AddChild(root221);
   root23->AddChild(root231);
 
@@ skipping 12 matching lines @@
   EXPECT_COUNT(root2, -1, -1, 6);
   EXPECT_COUNT(root21, -1, -1, 5);
   EXPECT_COUNT(root22, -1, -1, 4);
   EXPECT_COUNT(root221, -1, -1, 3);
   EXPECT_COUNT(root23, -1, -1, 2);
   EXPECT_COUNT(root231, -1, -1, 1);
   EXPECT_COUNT(root3, -1, -1, 0);
 }
 
 TEST(LayerIteratorTest, ComplexTreeMultiSurface) {
-  scoped_refptr<TestLayer> root_layer = TestLayer::Create();
-  scoped_refptr<TestLayer> root1 = TestLayer::Create();
-  scoped_refptr<TestLayer> root2 = TestLayer::Create();
-  scoped_refptr<TestLayer> root3 = TestLayer::Create();
-  scoped_refptr<TestLayer> root21 = TestLayer::Create();
-  scoped_refptr<TestLayer> root22 = TestLayer::Create();
-  scoped_refptr<TestLayer> root23 = TestLayer::Create();
-  scoped_refptr<TestLayer> root221 = TestLayer::Create();
-  scoped_refptr<TestLayer> root231 = TestLayer::Create();
+  LayerSettings settings;
+  scoped_refptr<TestLayer> root_layer = TestLayer::Create(settings);
+  scoped_refptr<TestLayer> root1 = TestLayer::Create(settings);
+  scoped_refptr<TestLayer> root2 = TestLayer::Create(settings);
+  scoped_refptr<TestLayer> root3 = TestLayer::Create(settings);
+  scoped_refptr<TestLayer> root21 = TestLayer::Create(settings);
+  scoped_refptr<TestLayer> root22 = TestLayer::Create(settings);
+  scoped_refptr<TestLayer> root23 = TestLayer::Create(settings);
+  scoped_refptr<TestLayer> root221 = TestLayer::Create(settings);
+  scoped_refptr<TestLayer> root231 = TestLayer::Create(settings);
 
   root_layer->AddChild(root1);
   root_layer->AddChild(root2);
   root_layer->AddChild(root3);
   root2->set_draws_content(false);
   root2->SetOpacity(0.5f);
   root2->SetForceRenderSurface(true);  // Force the layer to own a new surface.
   root2->AddChild(root21);
   root2->AddChild(root22);
   root2->AddChild(root23);
@@ skipping 18 matching lines @@
   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