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

cc/trees/layer_tree_host_unittest_occlusion.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/trees/layer_tree_host.h"
 
 #include "cc/layers/layer.h"
 #include "cc/layers/picture_layer.h"
 #include "cc/test/fake_content_layer_client.h"
 #include "cc/test/layer_tree_test.h"
@@ skipping 156 matching lines @@
     LayerTreeTest::SetupTree();
     client_.set_bounds(root->bounds());
   }
 
   void BeginTest() override { PostSetNeedsCommitToMainThread(); }
 
   void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
     LayerImpl* root = impl->active_tree()->root_layer();
     LayerImpl* child = impl->active_tree()->LayerById(child_->id());
     RenderSurfaceImpl* surface = child->render_surface();
-    LayerImpl* mask = child->mask_layer();
+    LayerImpl* mask = surface->MaskLayer();
 
     // Verify the draw properties are valid.
     EXPECT_TRUE(root->is_drawn_render_surface_layer_list_member());
     EXPECT_TRUE(child->is_drawn_render_surface_layer_list_member());
     EXPECT_TRUE(child->has_render_surface());
     EXPECT_EQ(child->render_surface(), child->render_target());
 
     gfx::Transform transform = surface->draw_transform();
     transform.PreconcatTransform(child->DrawTransform());
 
@@ skipping 50 matching lines @@
 
     layer_tree_host()->SetRootLayer(root);
     LayerTreeTest::SetupTree();
     client_.set_bounds(root->bounds());
   }
 
   void BeginTest() override { PostSetNeedsCommitToMainThread(); }
 
   void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
     LayerImpl* child = impl->active_tree()->LayerById(child_->id());
-    LayerImpl* mask = child->mask_layer();
+    LayerImpl* mask = child->render_surface()->MaskLayer();
 
     gfx::Transform scale;
     scale.Scale(2, 2);
 
     EXPECT_OCCLUSION_EQ(
         Occlusion(scale, SimpleEnclosedRegion(),
                   SimpleEnclosedRegion(gfx::Rect(13, 15, 10, 11))),
         mask->draw_properties().occlusion_in_content_space);
     EndTest();
   }
@@ skipping 49 matching lines @@
     LayerTreeTest::SetupTree();
     client_.set_bounds(root->bounds());
   }
 
   void BeginTest() override { PostSetNeedsCommitToMainThread(); }
 
   void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
     LayerImpl* root = impl->active_tree()->root_layer();
     LayerImpl* child = impl->active_tree()->LayerById(child_->id());
     RenderSurfaceImpl* surface = child->render_surface();
-    LayerImpl* mask = child->mask_layer();
+    LayerImpl* mask = surface->MaskLayer();
 
     // Verify the draw properties are valid.
     EXPECT_TRUE(root->is_drawn_render_surface_layer_list_member());
     EXPECT_TRUE(child->is_drawn_render_surface_layer_list_member());
     EXPECT_TRUE(child->has_render_surface());
     EXPECT_EQ(child->render_surface(), child->render_target());
 
     // No occlusion from on child, which is part of the replica.
     EXPECT_OCCLUSION_EQ(Occlusion(),
                         child->draw_properties().occlusion_in_content_space);
@@ skipping 13 matching lines @@
  private:
   FakeContentLayerClient client_;
   scoped_refptr<Layer> child_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostOcclusionTestDrawPropertiesInsideReplica);
 
 }  // namespace
 }  // namespace cc