cc: Chromify Layer and LayerImpl classes.

cc/layer_sorter_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 "cc/layer_sorter.h"
 
 #include "cc/layer_impl.h"
 #include "cc/math_util.h"
 #include "cc/single_thread_proxy.h"
 #include "cc/test/fake_impl_proxy.h"
@@ skipping 194 matching lines @@
   // Expected output: [3, 4, 1, 2, 5].
   //    - 1, 2, and 5 do not have a 3d z difference, and therefore their
   //      relative ordering should be retained.
   //    - 3 and 4 do not have a 3d z difference, and therefore their relative
   //      ordering should be retained.
   //    - 3 and 4 should be re-sorted so they are in front of 1, 2, and 5.
 
   FakeImplProxy proxy;
   FakeLayerTreeHostImpl host_impl(&proxy);
 
-  scoped_ptr<LayerImpl> layer1 = LayerImpl::create(host_impl.activeTree(), 1);
-  scoped_ptr<LayerImpl> layer2 = LayerImpl::create(host_impl.activeTree(), 2);
-  scoped_ptr<LayerImpl> layer3 = LayerImpl::create(host_impl.activeTree(), 3);
-  scoped_ptr<LayerImpl> layer4 = LayerImpl::create(host_impl.activeTree(), 4);
-  scoped_ptr<LayerImpl> layer5 = LayerImpl::create(host_impl.activeTree(), 5);
+  scoped_ptr<LayerImpl> layer1 = LayerImpl::Create(host_impl.activeTree(), 1);
+  scoped_ptr<LayerImpl> layer2 = LayerImpl::Create(host_impl.activeTree(), 2);
+  scoped_ptr<LayerImpl> layer3 = LayerImpl::Create(host_impl.activeTree(), 3);
+  scoped_ptr<LayerImpl> layer4 = LayerImpl::Create(host_impl.activeTree(), 4);
+  scoped_ptr<LayerImpl> layer5 = LayerImpl::Create(host_impl.activeTree(), 5);
 
   gfx::Transform BehindMatrix;
   BehindMatrix.Translate3d(0.0, 0.0, 2.0);
   gfx::Transform FrontMatrix;
   FrontMatrix.Translate3d(0.0, 0.0, 1.0);
 
-  layer1->setBounds(gfx::Size(10, 10));
-  layer1->setContentBounds(gfx::Size(10, 10));
-  layer1->drawProperties().target_space_transform = BehindMatrix;
-  layer1->setDrawsContent(true);
+  layer1->SetBounds(gfx::Size(10, 10));
+  layer1->SetContentBounds(gfx::Size(10, 10));
+  layer1->draw_properties().target_space_transform = BehindMatrix;
+  layer1->SetDrawsContent(true);
 
-  layer2->setBounds(gfx::Size(20, 20));
-  layer2->setContentBounds(gfx::Size(20, 20));
-  layer2->drawProperties().target_space_transform = BehindMatrix;
-  layer2->setDrawsContent(true);
+  layer2->SetBounds(gfx::Size(20, 20));
+  layer2->SetContentBounds(gfx::Size(20, 20));
+  layer2->draw_properties().target_space_transform = BehindMatrix;
+  layer2->SetDrawsContent(true);
 
-  layer3->setBounds(gfx::Size(30, 30));
-  layer3->setContentBounds(gfx::Size(30, 30));
-  layer3->drawProperties().target_space_transform = FrontMatrix;
-  layer3->setDrawsContent(true);
+  layer3->SetBounds(gfx::Size(30, 30));
+  layer3->SetContentBounds(gfx::Size(30, 30));
+  layer3->draw_properties().target_space_transform = FrontMatrix;
+  layer3->SetDrawsContent(true);
 
-  layer4->setBounds(gfx::Size(40, 40));
-  layer4->setContentBounds(gfx::Size(40, 40));
-  layer4->drawProperties().target_space_transform = FrontMatrix;
-  layer4->setDrawsContent(true);
+  layer4->SetBounds(gfx::Size(40, 40));
+  layer4->SetContentBounds(gfx::Size(40, 40));
+  layer4->draw_properties().target_space_transform = FrontMatrix;
+  layer4->SetDrawsContent(true);
 
-  layer5->setBounds(gfx::Size(50, 50));
-  layer5->setContentBounds(gfx::Size(50, 50));
-  layer5->drawProperties().target_space_transform = BehindMatrix;
-  layer5->setDrawsContent(true);
+  layer5->SetBounds(gfx::Size(50, 50));
+  layer5->SetContentBounds(gfx::Size(50, 50));
+  layer5->draw_properties().target_space_transform = BehindMatrix;
+  layer5->SetDrawsContent(true);
 
   std::vector<LayerImpl*> layer_list;
   layer_list.push_back(layer1.get());
   layer_list.push_back(layer2.get());
   layer_list.push_back(layer3.get());
   layer_list.push_back(layer4.get());
   layer_list.push_back(layer5.get());
 
   ASSERT_EQ(5u, layer_list.size());
   EXPECT_EQ(1, layer_list[0]->id());
@@ skipping 10 matching lines @@
   EXPECT_EQ(4, layer_list[1]->id());
   EXPECT_EQ(1, layer_list[2]->id());
   EXPECT_EQ(2, layer_list[3]->id());
   EXPECT_EQ(5, layer_list[4]->id());
 }
 
 TEST(LayerSorterTest, VerifyConcidentLayerPrecisionLossResultsInDocumentOrder) {
   FakeImplProxy proxy;
   FakeLayerTreeHostImpl host_impl(&proxy);
 
-  scoped_ptr<LayerImpl> layer1 = LayerImpl::create(host_impl.activeTree(), 1);
-  scoped_ptr<LayerImpl> layer2 = LayerImpl::create(host_impl.activeTree(), 2);
+  scoped_ptr<LayerImpl> layer1 = LayerImpl::Create(host_impl.activeTree(), 1);
+  scoped_ptr<LayerImpl> layer2 = LayerImpl::Create(host_impl.activeTree(), 2);
 
   // Layer 1 should occur before layer 2 in paint.  However, due to numeric
   // issues in the sorter, it will put the layers in the wrong order
   // in some situations.  Here we test a patch that results in  document
   // order rather than calculated order when numeric percision is suspect
   // in calculated order.
 
   gfx::Transform BehindMatrix;
   BehindMatrix.Translate3d(0.0, 0.0, 0.999999);
   BehindMatrix.RotateAboutXAxis(38.5);
   BehindMatrix.RotateAboutYAxis(77.0);
   gfx::Transform FrontMatrix;
   FrontMatrix.Translate3d(0, 0, 1.0);
   FrontMatrix.RotateAboutXAxis(38.5);
   FrontMatrix.RotateAboutYAxis(77.0);
 
-  layer1->setBounds(gfx::Size(10, 10));
-  layer1->setContentBounds(gfx::Size(10, 10));
-  layer1->drawProperties().target_space_transform = BehindMatrix;
-  layer1->setDrawsContent(true);
+  layer1->SetBounds(gfx::Size(10, 10));
+  layer1->SetContentBounds(gfx::Size(10, 10));
+  layer1->draw_properties().target_space_transform = BehindMatrix;
+  layer1->SetDrawsContent(true);
 
-  layer2->setBounds(gfx::Size(10, 10));
-  layer2->setContentBounds(gfx::Size(10, 10));
-  layer2->drawProperties().target_space_transform = FrontMatrix;
-  layer2->setDrawsContent(true);
+  layer2->SetBounds(gfx::Size(10, 10));
+  layer2->SetContentBounds(gfx::Size(10, 10));
+  layer2->draw_properties().target_space_transform = FrontMatrix;
+  layer2->SetDrawsContent(true);
 
   std::vector<LayerImpl*> layer_list;
   layer_list.push_back(layer1.get());
   layer_list.push_back(layer2.get());
 
   ASSERT_EQ(2u, layer_list.size());
   EXPECT_EQ(1, layer_list[0]->id());
   EXPECT_EQ(2, layer_list[1]->id());
 
   LayerSorter layer_sorter;
   layer_sorter.Sort(layer_list.begin(), layer_list.end());
 
   ASSERT_EQ(2u, layer_list.size());
   EXPECT_EQ(1, layer_list[0]->id());
   EXPECT_EQ(2, layer_list[1]->id());
 }
 
 }  // namespace
 }  // namespace cc