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

cc/trees/layer_tree_host_common.cc

Index: cc/trees/layer_tree_host_common.cc
diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc
index 7cd8974bf0c2d5aeebd6310be4c78312e6697f99..71d8e6be0a6626f00b14320fadb73cd0f29cbe5b 100644
--- a/cc/trees/layer_tree_host_common.cc
+++ b/cc/trees/layer_tree_host_common.cc
@@ -186,32 +186,29 @@ void ScrollAndScaleSet::FromProtobuf(const proto::ScrollAndScaleSet& proto) {
 }
 
 static inline void SetMaskLayersAreDrawnRenderSurfaceLayerListMembers(
-    LayerImpl* layer,
+    RenderSurfaceImpl* surface,
     PropertyTrees* property_trees) {
-  if (layer->mask_layer()) {
-    layer->mask_layer()->set_is_drawn_render_surface_layer_list_member(true);
-    draw_property_utils::ComputeMaskDrawProperties(layer->mask_layer(),
-                                                   property_trees);
+  LayerImpl* mask_layer = surface->MaskLayer();
+  LayerImpl* replica_mask_layer = surface->ReplicaMaskLayer();
+  if (mask_layer) {
+    mask_layer->set_is_drawn_render_surface_layer_list_member(true);
+    draw_property_utils::ComputeMaskDrawProperties(mask_layer, property_trees);
   }
-  if (layer->replica_layer() && layer->replica_layer()->mask_layer()) {
-    layer->replica_layer()
-        ->mask_layer()
-        ->set_is_drawn_render_surface_layer_list_member(true);
-    draw_property_utils::ComputeMaskDrawProperties(
-        layer->replica_layer()->mask_layer(), property_trees);
+  if (replica_mask_layer) {
+    replica_mask_layer->set_is_drawn_render_surface_layer_list_member(true);
+    draw_property_utils::ComputeMaskDrawProperties(replica_mask_layer,
+                                                   property_trees);
   }
 }
 
-static inline void ClearLayerIsDrawnRenderSurfaceLayerListMember(
-    LayerImpl* layer) {
-  layer->set_is_drawn_render_surface_layer_list_member(false);
-  if (layer->mask_layer())
-    layer->mask_layer()->set_is_drawn_render_surface_layer_list_member(false);
-  if (layer->replica_layer() && layer->replica_layer()->mask_layer()) {
-    layer->replica_layer()
-        ->mask_layer()
-        ->set_is_drawn_render_surface_layer_list_member(false);
-  }
+static inline void ClearMaskLayersAreDrawnRenderSurfaceLayerListMembers(
+    RenderSurfaceImpl* surface) {
+  LayerImpl* mask_layer = surface->MaskLayer();
+  LayerImpl* replica_mask_layer = surface->ReplicaMaskLayer();
+  if (mask_layer)
+    mask_layer->set_is_drawn_render_surface_layer_list_member(false);
+  if (replica_mask_layer)
+    replica_mask_layer->set_is_drawn_render_surface_layer_list_member(false);
 }
 
 static inline void ClearIsDrawnRenderSurfaceLayerListMember(
@@ -225,7 +222,7 @@ static inline void ClearIsDrawnRenderSurfaceLayerListMember(
       scroll_tree->Node(layer->scroll_tree_index())
           ->data.num_drawn_descendants--;
     }
-    ClearLayerIsDrawnRenderSurfaceLayerListMember(layer);
+    layer->set_is_drawn_render_surface_layer_list_member(false);
   }
 }
 
@@ -330,9 +327,12 @@ static void ComputeInitialRenderSurfaceLayerList(
   // all non-skipped layers to the layer list of their target surface, and
   // add their content rect to their target surface's accumulated content rect.
   for (LayerImpl* layer : *layer_tree_impl) {
-    if (layer->render_surface())
+    if (layer->render_surface()) {
       layer->ClearRenderSurfaceLayerList();
-    ClearLayerIsDrawnRenderSurfaceLayerListMember(layer);
+      ClearMaskLayersAreDrawnRenderSurfaceLayerListMembers(
+          layer->render_surface());
+    }
+    layer->set_is_drawn_render_surface_layer_list_member(false);
 
     bool layer_is_drawn =
         property_trees->effect_tree.Node(layer->effect_tree_index())
@@ -378,7 +378,7 @@ static void ComputeInitialRenderSurfaceLayerList(
       // TODO(senorblanco): make this smarter for the SkImageFilter case (check
       // for pixel-moving filters)
       bool is_occlusion_immune = surface->HasCopyRequest() ||
-                                 layer->has_replica() ||
+                                 surface->HasReplica() ||
                                  layer->filters().HasReferenceFilter() ||
                                  layer->filters().HasFilterThatMovesPixels();
       if (is_occlusion_immune) {
@@ -464,7 +464,7 @@ static void ComputeListOfNonEmptySurfaces(LayerTreeImpl* layer_tree_impl,
       }
       continue;
     }
-    SetMaskLayersAreDrawnRenderSurfaceLayerListMembers(layer, property_trees);
+    SetMaskLayersAreDrawnRenderSurfaceLayerListMembers(surface, property_trees);
     final_surface_list->push_back(layer);
   }
 }