Get rid of graphics layer anchor points, and replace with transform origin.

cc/trees/damage_tracker_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/trees/damage_tracker.h"
 
 #include "cc/base/math_util.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/output/filter_operation.h"
 #include "cc/output/filter_operations.h"
 #include "cc/test/fake_impl_proxy.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/test/test_shared_bitmap_manager.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/skia/include/effects/SkBlurImageFilter.h"
 #include "ui/gfx/geometry/quad_f.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 
 namespace cc {
 namespace {
 
 void ExecuteCalculateDrawProperties(LayerImpl* root,
-                                    LayerImplList& render_surface_layer_list) {
+                                    LayerImplList* render_surface_layer_list) {
   // Sanity check: The test itself should create the root layer's render
   //               surface, so that the surface (and its damage tracker) can
   //               persist across multiple calls to this function.
   ASSERT_TRUE(root->render_surface());
-  ASSERT_FALSE(render_surface_layer_list.size());
+  ASSERT_FALSE(render_surface_layer_list->size());
 
   LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
-      root, root->bounds(), &render_surface_layer_list);
+      root, root->bounds(), render_surface_layer_list);
   LayerTreeHostCommon::CalculateDrawProperties(&inputs);
 }
 
 void ClearDamageForAllSurfaces(LayerImpl* layer) {
   if (layer->render_surface())
     layer->render_surface()->damage_tracker()->DidDrawDamagedArea();
 
   // Recursively clear damage for any existing surface.
   for (size_t i = 0; i < layer->children().size(); ++i)
     ClearDamageForAllSurfaces(layer->children()[i]);
 }
 
 void EmulateDrawingOneFrame(LayerImpl* root) {
   // This emulates only steps that are relevant to testing the damage tracker:
   //   1. computing the render passes and layerlists
   //   2. updating all damage trackers in the correct order
   //   3. resetting all update_rects and property_changed flags for all layers
   //      and surfaces.
 
   LayerImplList render_surface_layer_list;
-  ExecuteCalculateDrawProperties(root, render_surface_layer_list);
+  ExecuteCalculateDrawProperties(root, &render_surface_layer_list);
 
   // Iterate back-to-front, so that damage correctly propagates from descendant
   // surfaces to ancestors.
   for (int i = render_surface_layer_list.size() - 1; i >= 0; --i) {
     RenderSurfaceImpl* target_surface =
             render_surface_layer_list[i]->render_surface();
     target_surface->damage_tracker()->UpdateDamageTrackingState(
         target_surface->layer_list(),
         target_surface->OwningLayerId(),
         target_surface->SurfacePropertyChangedOnlyFromDescendant(),
         target_surface->content_rect(),
         render_surface_layer_list[i]->mask_layer(),
         render_surface_layer_list[i]->filters());
   }
 
   root->ResetAllChangeTrackingForSubtree();
 }
 
 class DamageTrackerTest : public testing::Test {
  public:
   DamageTrackerTest() : host_impl_(&proxy_, &shared_bitmap_manager_) {}
 
   scoped_ptr<LayerImpl> CreateTestTreeWithOneSurface() {
     scoped_ptr<LayerImpl> root =
             LayerImpl::Create(host_impl_.active_tree(), 1);
     scoped_ptr<LayerImpl> child =
             LayerImpl::Create(host_impl_.active_tree(), 2);
 
     root->SetPosition(gfx::PointF());
-    root->SetAnchorPoint(gfx::PointF());
+    root->SetTransformOrigin(gfx::Point3F());
     root->SetBounds(gfx::Size(500, 500));
     root->SetContentBounds(gfx::Size(500, 500));
     root->SetDrawsContent(true);
     root->CreateRenderSurface();
     root->render_surface()->SetContentRect(gfx::Rect(0, 0, 500, 500));
 
     child->SetPosition(gfx::PointF(100.f, 100.f));
-    child->SetAnchorPoint(gfx::PointF());
+    child->SetTransformOrigin(gfx::Point3F());
     child->SetBounds(gfx::Size(30, 30));
     child->SetContentBounds(gfx::Size(30, 30));
     child->SetDrawsContent(true);
     root->AddChild(child.Pass());
 
     return root.Pass();
   }
 
   scoped_ptr<LayerImpl> CreateTestTreeWithTwoSurfaces() {
     // This test tree has two render surfaces: one for the root, and one for
     // child1. Additionally, the root has a second child layer, and child1 has
     // two children of its own.
 
     scoped_ptr<LayerImpl> root =
             LayerImpl::Create(host_impl_.active_tree(), 1);
     scoped_ptr<LayerImpl> child1 =
             LayerImpl::Create(host_impl_.active_tree(), 2);
     scoped_ptr<LayerImpl> child2 =
             LayerImpl::Create(host_impl_.active_tree(), 3);
     scoped_ptr<LayerImpl> grand_child1 =
             LayerImpl::Create(host_impl_.active_tree(), 4);
     scoped_ptr<LayerImpl> grand_child2 =
             LayerImpl::Create(host_impl_.active_tree(), 5);
 
     root->SetPosition(gfx::PointF());
-    root->SetAnchorPoint(gfx::PointF());
+    root->SetTransformOrigin(gfx::Point3F());
     root->SetBounds(gfx::Size(500, 500));
     root->SetContentBounds(gfx::Size(500, 500));
     root->SetDrawsContent(true);
     root->CreateRenderSurface();
     root->render_surface()->SetContentRect(gfx::Rect(0, 0, 500, 500));
 
     child1->SetPosition(gfx::PointF(100.f, 100.f));
-    child1->SetAnchorPoint(gfx::PointF());
+    child1->SetTransformOrigin(gfx::Point3F());
     child1->SetBounds(gfx::Size(30, 30));
     child1->SetContentBounds(gfx::Size(30, 30));
     // With a child that draws_content, opacity will cause the layer to create
     // its own RenderSurface. This layer does not draw, but is intended to
     // create its own RenderSurface. TODO: setting opacity and
     // ForceRenderSurface may be redundant here.
     child1->SetOpacity(0.5f);
     child1->SetDrawsContent(false);
     child1->SetForceRenderSurface(true);
 
     child2->SetPosition(gfx::PointF(11.f, 11.f));
-    child2->SetAnchorPoint(gfx::PointF());
+    child2->SetTransformOrigin(gfx::Point3F());
     child2->SetBounds(gfx::Size(18, 18));
     child2->SetContentBounds(gfx::Size(18, 18));
     child2->SetDrawsContent(true);
 
     grand_child1->SetPosition(gfx::PointF(200.f, 200.f));
-    grand_child1->SetAnchorPoint(gfx::PointF());
+    grand_child1->SetTransformOrigin(gfx::Point3F());
     grand_child1->SetBounds(gfx::Size(6, 8));
     grand_child1->SetContentBounds(gfx::Size(6, 8));
     grand_child1->SetDrawsContent(true);
 
     grand_child2->SetPosition(gfx::PointF(190.f, 190.f));
-    grand_child2->SetAnchorPoint(gfx::PointF());
+    grand_child2->SetTransformOrigin(gfx::Point3F());
     grand_child2->SetBounds(gfx::Size(6, 8));
     grand_child2->SetContentBounds(gfx::Size(6, 8));
     grand_child2->SetDrawsContent(true);
 
     child1->AddChild(grand_child1.Pass());
     child1->AddChild(grand_child2.Pass());
     root->AddChild(child1.Pass());
     root->AddChild(child2.Pass());
 
     return root.Pass();
@@ skipping 250 matching lines @@
   // If a layer is transformed, the damage rect should still enclose the entire
   // transformed layer.
 
   scoped_ptr<LayerImpl> root = CreateAndSetUpTestTreeWithOneSurface();
   LayerImpl* child = root->children()[0];
 
   gfx::Transform rotation;
   rotation.Rotate(45.0);
 
   ClearDamageForAllSurfaces(root.get());
-  child->SetAnchorPoint(gfx::PointF(0.5f, 0.5f));
+  child->SetTransformOrigin(gfx::Point3F(
+      child->bounds().width() * 0.5f, child->bounds().height() * 0.5f, 0.f));
   child->SetPosition(gfx::PointF(85.f, 85.f));
   EmulateDrawingOneFrame(root.get());
 
   // Sanity check that the layer actually moved to (85, 85), damaging its old
   // location and new location.
   gfx::Rect root_damage_rect =
       root->render_surface()->damage_tracker()->current_damage_rect();
   EXPECT_EQ(gfx::Rect(85, 85, 45, 45).ToString(), root_damage_rect.ToString());
 
   // With the anchor on the layer's center, now we can test the rotation more
@@ skipping 269 matching lines @@
   scoped_ptr<LayerImpl> root = CreateAndSetUpTestTreeWithOneSurface();
   LayerImpl* child1 = root->children()[0];
 
   // CASE 1: Adding a new layer should cause the appropriate damage.
   //
   ClearDamageForAllSurfaces(root.get());
   {
     scoped_ptr<LayerImpl> child2 =
             LayerImpl::Create(host_impl_.active_tree(), 3);
     child2->SetPosition(gfx::PointF(400.f, 380.f));
-    child2->SetAnchorPoint(gfx::PointF());
+    child2->SetTransformOrigin(gfx::Point3F());
     child2->SetBounds(gfx::Size(6, 8));
     child2->SetContentBounds(gfx::Size(6, 8));
     child2->SetDrawsContent(true);
     root->AddChild(child2.Pass());
   }
   EmulateDrawingOneFrame(root.get());
 
   // Sanity check - all 3 layers should be on the same render surface; render
   // surfaces are tested elsewhere.
   ASSERT_EQ(3u, root->render_surface()->layer_list().size());
@@ skipping 29 matching lines @@
   // If child2 is added to the layer tree, but it doesn't have any explicit
   // damage of its own, it should still indeed damage the target surface.
 
   scoped_ptr<LayerImpl> root = CreateAndSetUpTestTreeWithOneSurface();
 
   ClearDamageForAllSurfaces(root.get());
   {
     scoped_ptr<LayerImpl> child2 =
             LayerImpl::Create(host_impl_.active_tree(), 3);
     child2->SetPosition(gfx::PointF(400.f, 380.f));
-    child2->SetAnchorPoint(gfx::PointF());
+    child2->SetTransformOrigin(gfx::Point3F());
     child2->SetBounds(gfx::Size(6, 8));
     child2->SetContentBounds(gfx::Size(6, 8));
     child2->SetDrawsContent(true);
     child2->ResetAllChangeTrackingForSubtree();
     // Sanity check the initial conditions of the test, if these asserts
     // trigger, it means the test no longer actually covers the intended
     // scenario.
     ASSERT_FALSE(child2->LayerPropertyChanged());
     ASSERT_TRUE(child2->update_rect().IsEmpty());
     root->AddChild(child2.Pass());
@@ skipping 13 matching lines @@
   scoped_ptr<LayerImpl> root = CreateAndSetUpTestTreeWithOneSurface();
   LayerImpl* child1 = root->children()[0];
 
   // In this test we don't want the above tree manipulation to be considered
   // part of the same frame.
   ClearDamageForAllSurfaces(root.get());
   {
     scoped_ptr<LayerImpl> child2 =
             LayerImpl::Create(host_impl_.active_tree(), 3);
     child2->SetPosition(gfx::PointF(400.f, 380.f));
-    child2->SetAnchorPoint(gfx::PointF());
+    child2->SetTransformOrigin(gfx::Point3F());
     child2->SetBounds(gfx::Size(6, 8));
     child2->SetContentBounds(gfx::Size(6, 8));
     child2->SetDrawsContent(true);
     root->AddChild(child2.Pass());
   }
   LayerImpl* child2 = root->children()[1];
   EmulateDrawingOneFrame(root.get());
 
   // Damaging two layers simultaneously should cause combined damage.
   // - child1 update rect in surface space: gfx::Rect(100, 100, 1, 2);
@@ skipping 231 matching lines @@
   // to receive the surface's damage and the surface's reflected damage.
 
   // For this test case, we modify grand_child2, and add grand_child3 to extend
   // the bounds of child1's surface. This way, we can test reflection changes
   // without changing content_bounds of the surface.
   grand_child2->SetPosition(gfx::PointF(180.f, 180.f));
   {
     scoped_ptr<LayerImpl> grand_child3 =
             LayerImpl::Create(host_impl_.active_tree(), 6);
     grand_child3->SetPosition(gfx::PointF(240.f, 240.f));
-    grand_child3->SetAnchorPoint(gfx::PointF());
+    grand_child3->SetTransformOrigin(gfx::Point3F());
     grand_child3->SetBounds(gfx::Size(10, 10));
     grand_child3->SetContentBounds(gfx::Size(10, 10));
     grand_child3->SetDrawsContent(true);
     child1->AddChild(grand_child3.Pass());
   }
   child1->SetOpacity(0.5f);
   EmulateDrawingOneFrame(root.get());
 
   // CASE 1: adding a reflection about the left edge of grand_child1.
   //
   ClearDamageForAllSurfaces(root.get());
   {
     scoped_ptr<LayerImpl> grand_child1_replica =
             LayerImpl::Create(host_impl_.active_tree(), 7);
     grand_child1_replica->SetPosition(gfx::PointF());
-    grand_child1_replica->SetAnchorPoint(gfx::PointF());
+    grand_child1_replica->SetTransformOrigin(gfx::Point3F());
     gfx::Transform reflection;
     reflection.Scale3d(-1.0, 1.0, 1.0);
     grand_child1_replica->SetTransform(reflection);
     grand_child1->SetReplicaLayer(grand_child1_replica.Pass());
   }
   EmulateDrawingOneFrame(root.get());
 
   gfx::Rect grand_child_damage_rect =
       grand_child1->render_surface()->damage_tracker()->current_damage_rect();
   gfx::Rect child_damage_rect =
@@ skipping 65 matching lines @@
   // In the current implementation of the damage tracker, changes to mask
   // layers should damage the entire corresponding surface.
 
   ClearDamageForAllSurfaces(root.get());
 
   // Set up the mask layer.
   {
     scoped_ptr<LayerImpl> mask_layer =
             LayerImpl::Create(host_impl_.active_tree(), 3);
     mask_layer->SetPosition(child->position());
-    mask_layer->SetAnchorPoint(gfx::PointF());
+    mask_layer->SetTransformOrigin(gfx::Point3F());
     mask_layer->SetBounds(child->bounds());
     mask_layer->SetContentBounds(child->bounds());
     child->SetMaskLayer(mask_layer.Pass());
   }
   LayerImpl* mask_layer = child->mask_layer();
 
   // Add opacity and a grand_child so that the render surface persists even
   // after we remove the mask.
   child->SetOpacity(0.5f);
   {
     scoped_ptr<LayerImpl> grand_child =
             LayerImpl::Create(host_impl_.active_tree(), 4);
     grand_child->SetPosition(gfx::PointF(2.f, 2.f));
-    grand_child->SetAnchorPoint(gfx::PointF());
+    grand_child->SetTransformOrigin(gfx::Point3F());
     grand_child->SetBounds(gfx::Size(2, 2));
     grand_child->SetContentBounds(gfx::Size(2, 2));
     grand_child->SetDrawsContent(true);
     child->AddChild(grand_child.Pass());
   }
   EmulateDrawingOneFrame(root.get());
 
   // Sanity check that a new surface was created for the child.
   ASSERT_TRUE(child->render_surface());
 
@@ skipping 59 matching lines @@
   // Changes to a replica's mask should not damage the original surface,
   // because it is not masked. But it does damage the ancestor target surface.
 
   ClearDamageForAllSurfaces(root.get());
 
   // Create a reflection about the left edge of grand_child1.
   {
     scoped_ptr<LayerImpl> grand_child1_replica =
             LayerImpl::Create(host_impl_.active_tree(), 6);
     grand_child1_replica->SetPosition(gfx::PointF());
-    grand_child1_replica->SetAnchorPoint(gfx::PointF());
+    grand_child1_replica->SetTransformOrigin(gfx::Point3F());
     gfx::Transform reflection;
     reflection.Scale3d(-1.0, 1.0, 1.0);
     grand_child1_replica->SetTransform(reflection);
     grand_child1->SetReplicaLayer(grand_child1_replica.Pass());
   }
   LayerImpl* grand_child1_replica = grand_child1->replica_layer();
 
   // Set up the mask layer on the replica layer
   {
     scoped_ptr<LayerImpl> replica_mask_layer =
             LayerImpl::Create(host_impl_.active_tree(), 7);
     replica_mask_layer->SetPosition(gfx::PointF());
-    replica_mask_layer->SetAnchorPoint(gfx::PointF());
+    replica_mask_layer->SetTransformOrigin(gfx::Point3F());
     replica_mask_layer->SetBounds(grand_child1->bounds());
     replica_mask_layer->SetContentBounds(grand_child1->bounds());
     grand_child1_replica->SetMaskLayer(replica_mask_layer.Pass());
   }
   LayerImpl* replica_mask_layer = grand_child1_replica->mask_layer();
 
   EmulateDrawingOneFrame(root.get());
 
   // Sanity check that the appropriate render surfaces were created
   ASSERT_TRUE(grand_child1->render_surface());
@@ skipping 22 matching lines @@
   grand_child_damage_rect =
           grand_child1->render_surface()->damage_tracker()->
               current_damage_rect();
   child_damage_rect =
           child1->render_surface()->damage_tracker()->current_damage_rect();
 
   EXPECT_TRUE(grand_child_damage_rect.IsEmpty());
   EXPECT_EQ(gfx::Rect(194, 200, 6, 8).ToString(), child_damage_rect.ToString());
 }
 
-TEST_F(DamageTrackerTest, VerifyDamageForReplicaMaskWithAnchor) {
+TEST_F(DamageTrackerTest, VerifyDamageForReplicaMaskWithTransformOrigin) {
   scoped_ptr<LayerImpl> root = CreateAndSetUpTestTreeWithTwoSurfaces();
   LayerImpl* child1 = root->children()[0];
   LayerImpl* grand_child1 = child1->children()[0];
 
   // Verify that the correct replica_origin_transform is used for the
   // replica_mask.
   ClearDamageForAllSurfaces(root.get());
 
-  // This is not actually the anchor point being tested, but by convention its
+  // This is not actually the transform origin point being tested, but by
+  // convention its
   // expected to be the same as the replica's anchor point.
-  grand_child1->SetAnchorPoint(gfx::PointF(1.f, 0.f));
+  grand_child1->SetTransformOrigin(
+      gfx::Point3F(grand_child1->bounds().width(), 0.f, 0.f));
 
   {
     scoped_ptr<LayerImpl> grand_child1_replica =
             LayerImpl::Create(host_impl_.active_tree(), 6);
     grand_child1_replica->SetPosition(gfx::PointF());
 
     // This is the anchor being tested.
-    grand_child1_replica->SetAnchorPoint(gfx::PointF(1.f, 0.f));
+    grand_child1_replica->SetTransformOrigin(
+        gfx::Point3F(grand_child1->bounds().width(), 0.f, 0.f));
     gfx::Transform reflection;
     reflection.Scale3d(-1.0, 1.0, 1.0);
     grand_child1_replica->SetTransform(reflection);
     grand_child1->SetReplicaLayer(grand_child1_replica.Pass());
   }
   LayerImpl* grand_child1_replica = grand_child1->replica_layer();
 
   // Set up the mask layer on the replica layer
   {
     scoped_ptr<LayerImpl> replica_mask_layer =
             LayerImpl::Create(host_impl_.active_tree(), 7);
     replica_mask_layer->SetPosition(gfx::PointF());
-    // Note: this is not the anchor being tested.
-    replica_mask_layer->SetAnchorPoint(gfx::PointF());
+    // Note: this is not the transform origin being tested.
+    replica_mask_layer->SetTransformOrigin(gfx::Point3F());
     replica_mask_layer->SetBounds(grand_child1->bounds());
     replica_mask_layer->SetContentBounds(grand_child1->bounds());
     grand_child1_replica->SetMaskLayer(replica_mask_layer.Pass());
   }
   LayerImpl* replica_mask_layer = grand_child1_replica->mask_layer();
 
   EmulateDrawingOneFrame(root.get());
 
   // Sanity check that the appropriate render surfaces were created
   ASSERT_TRUE(grand_child1->render_surface());
@@ skipping 130 matching lines @@
     gfx::Rect root_damage_rect =
         root->render_surface()->damage_tracker()->current_damage_rect();
     gfx::Rect damage_we_care_about = gfx::Rect(i, i);
     EXPECT_LE(damage_we_care_about.right(), root_damage_rect.right());
     EXPECT_LE(damage_we_care_about.bottom(), root_damage_rect.bottom());
   }
 }
 
 }  // namespace
 }  // namespace cc