cc: Add mask and replica layer ids to the effect tree

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 <stddef.h>
 
 #include "cc/base/math_util.h"
 #include "cc/layers/layer_impl.h"
@@ skipping 50 matching lines @@
   // surfaces to ancestors.
   size_t render_surface_layer_list_size = render_surface_layer_list.size();
   for (size_t i = 0; i < render_surface_layer_list_size; ++i) {
     size_t index = render_surface_layer_list_size - 1 - i;
     RenderSurfaceImpl* target_surface =
         render_surface_layer_list[index]->render_surface();
     target_surface->damage_tracker()->UpdateDamageTrackingState(
         target_surface->layer_list(), target_surface,
         target_surface->SurfacePropertyChangedOnlyFromDescendant(),
         target_surface->content_rect(),
-        render_surface_layer_list[index]->mask_layer(),
+        render_surface_layer_list[index]->render_surface()->MaskLayer(),
         render_surface_layer_list[index]->filters());
   }
 
   root->layer_tree_impl()->ResetAllChangeTracking();
 }
 
 class DamageTrackerTest : public testing::Test {
  public:
   DamageTrackerTest()
       : host_impl_(&task_runner_provider_,
@@ skipping 1110 matching lines @@
   // CASE 1: adding a reflection about the left edge of grand_child1.
   //
   ClearDamageForAllSurfaces(root);
   {
     std::unique_ptr<LayerImpl> grand_child1_replica =
         LayerImpl::Create(host_impl_.active_tree(), 7);
     grand_child1_replica->SetPosition(gfx::PointF());
     gfx::Transform reflection;
     reflection.Scale3d(-1.0, 1.0, 1.0);
     grand_child1_replica->SetTransform(reflection);
-    grand_child1->SetReplicaLayer(std::move(grand_child1_replica));
+    grand_child1->test_properties()->SetReplicaLayer(
+        std::move(grand_child1_replica));
     grand_child1->test_properties()->force_render_surface = true;
     grand_child1->NoteLayerPropertyChanged();
   }
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
 
   gfx::Rect grand_child_damage_rect =
       grand_child1->render_surface()->damage_tracker()->current_damage_rect();
   gfx::Rect child_damage_rect =
       child1->render_surface()->damage_tracker()->current_damage_rect();
@@ skipping 34 matching lines @@
   //  - new location in target space: gfx::Rect(189, 205, 12, 8)
   EXPECT_EQ(gfx::Rect(6, 8).ToString(), grand_child_damage_rect.ToString());
   EXPECT_EQ(gfx::Rect(189, 200, 17, 13).ToString(),
             child_damage_rect.ToString());
   EXPECT_EQ(gfx::Rect(289, 300, 17, 13).ToString(),
             root_damage_rect.ToString());
 
   // CASE 3: removing the reflection should cause the entire region including
   //         reflection to damage the target surface.
   ClearDamageForAllSurfaces(root);
-  grand_child1->SetReplicaLayer(nullptr);
+  grand_child1->test_properties()->SetReplicaLayer(nullptr);
   grand_child1->test_properties()->force_render_surface = false;
   grand_child1->NoteLayerPropertyChanged();
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
   ASSERT_EQ(old_content_rect.width(),
             child1->render_surface()->content_rect().width());
   ASSERT_EQ(old_content_rect.height(),
             child1->render_surface()->content_rect().height());
 
   EXPECT_FALSE(grand_child1->render_surface());
@@ skipping 15 matching lines @@
   // layers should damage the entire corresponding surface.
 
   ClearDamageForAllSurfaces(root);
 
   // Set up the mask layer.
   {
     std::unique_ptr<LayerImpl> mask_layer =
         LayerImpl::Create(host_impl_.active_tree(), 3);
     mask_layer->SetPosition(child->position());
     mask_layer->SetBounds(child->bounds());
-    child->SetMaskLayer(std::move(mask_layer));
+    child->test_properties()->SetMaskLayer(std::move(mask_layer));
     child->test_properties()->force_render_surface = true;
   }
-  LayerImpl* mask_layer = child->mask_layer();
+  LayerImpl* mask_layer = child->test_properties()->mask_layer;
 
   // Add opacity and a grand_child so that the render surface persists even
   // after we remove the mask.
   {
     std::unique_ptr<LayerImpl> grand_child =
         LayerImpl::Create(host_impl_.active_tree(), 4);
     grand_child->SetPosition(gfx::PointF(2.f, 2.f));
     grand_child->SetBounds(gfx::Size(2, 2));
     grand_child->SetDrawsContent(true);
     child->AddChild(std::move(grand_child));
@@ skipping 40 matching lines @@
   // leftover from the previous case.
   ClearDamageForAllSurfaces(root);
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
   child_damage_rect =
           child->render_surface()->damage_tracker()->current_damage_rect();
   EXPECT_TRUE(child_damage_rect.IsEmpty());
 
   // Then test mask removal.
   ClearDamageForAllSurfaces(root);
-  child->SetMaskLayer(nullptr);
+  child->test_properties()->SetMaskLayer(nullptr);
   child->NoteLayerPropertyChanged();
   ASSERT_TRUE(child->LayerPropertyChanged());
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
 
   // Sanity check that a render surface still exists.
   ASSERT_TRUE(child->render_surface());
 
   child_damage_rect =
           child->render_surface()->damage_tracker()->current_damage_rect();
@@ skipping 11 matching lines @@
   ClearDamageForAllSurfaces(root);
 
   // Create a reflection about the left edge of grand_child1.
   {
     std::unique_ptr<LayerImpl> grand_child1_replica =
         LayerImpl::Create(host_impl_.active_tree(), 6);
     grand_child1_replica->SetPosition(gfx::PointF());
     gfx::Transform reflection;
     reflection.Scale3d(-1.0, 1.0, 1.0);
     grand_child1_replica->SetTransform(reflection);
-    grand_child1->SetReplicaLayer(std::move(grand_child1_replica));
+    grand_child1->test_properties()->SetReplicaLayer(
+        std::move(grand_child1_replica));
     grand_child1->test_properties()->force_render_surface = true;
   }
-  LayerImpl* grand_child1_replica = grand_child1->replica_layer();
+  LayerImpl* grand_child1_replica =
+      grand_child1->test_properties()->replica_layer;
 
   // Set up the mask layer on the replica layer
   {
     std::unique_ptr<LayerImpl> replica_mask_layer =
         LayerImpl::Create(host_impl_.active_tree(), 7);
     replica_mask_layer->SetPosition(gfx::PointF());
     replica_mask_layer->SetBounds(grand_child1->bounds());
-    grand_child1_replica->SetMaskLayer(std::move(replica_mask_layer));
+    grand_child1_replica->test_properties()->SetMaskLayer(
+        std::move(replica_mask_layer));
   }
-  LayerImpl* replica_mask_layer = grand_child1_replica->mask_layer();
+  LayerImpl* replica_mask_layer =
+      grand_child1_replica->test_properties()->mask_layer;
 
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
 
   // Sanity check that the appropriate render surfaces were created
   ASSERT_TRUE(grand_child1->render_surface());
 
   // CASE 1: a property change on the mask should damage only the reflected
   //         region on the target surface.
   ClearDamageForAllSurfaces(root);
   replica_mask_layer->NoteLayerPropertyChanged();
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
 
   gfx::Rect grand_child_damage_rect =
       grand_child1->render_surface()->damage_tracker()->current_damage_rect();
   gfx::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());
 
   // CASE 2: removing the replica mask damages only the reflected region on the
   //         target surface.
   //
   ClearDamageForAllSurfaces(root);
-  grand_child1_replica->SetMaskLayer(nullptr);
+  grand_child1_replica->test_properties()->SetMaskLayer(nullptr);
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
 
   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());
@@ skipping 21 matching lines @@
     grand_child1_replica->SetPosition(gfx::PointF());
 
     // This is the anchor being tested.
     grand_child1_replica->test_properties()->transform_origin =
         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);
     // We need to set parent on replica layer for property tree building.
     grand_child1_replica->SetParent(grand_child1);
-    grand_child1->SetReplicaLayer(std::move(grand_child1_replica));
+    grand_child1->test_properties()->SetReplicaLayer(
+        std::move(grand_child1_replica));
     grand_child1->test_properties()->force_render_surface = true;
   }
-  LayerImpl* grand_child1_replica = grand_child1->replica_layer();
+  LayerImpl* grand_child1_replica =
+      grand_child1->test_properties()->replica_layer;
 
   // Set up the mask layer on the replica layer
   {
     std::unique_ptr<LayerImpl> replica_mask_layer =
         LayerImpl::Create(host_impl_.active_tree(), 7);
     replica_mask_layer->SetPosition(gfx::PointF());
     // Note: this is not the transform origin being tested.
     replica_mask_layer->SetBounds(grand_child1->bounds());
-    grand_child1_replica->SetMaskLayer(std::move(replica_mask_layer));
+    grand_child1_replica->test_properties()->SetMaskLayer(
+        std::move(replica_mask_layer));
   }
-  LayerImpl* replica_mask_layer = grand_child1_replica->mask_layer();
+  LayerImpl* replica_mask_layer =
+      grand_child1_replica->test_properties()->mask_layer;
 
   root->layer_tree_impl()->property_trees()->needs_rebuild = true;
   EmulateDrawingOneFrame(root);
 
   // Sanity check that the appropriate render surfaces were created
   ASSERT_TRUE(grand_child1->render_surface());
 
   // A property change on the replica_mask should damage the reflected region on
   // the target surface.
   ClearDamageForAllSurfaces(root);
@@ skipping 132 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