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

cc/trees/damage_tracker.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 <algorithm>
 
@@ skipping 372 matching lines @@
         render_surface->damage_tracker()->current_damage_rect();
 
     // If there was damage, transform it to target space, and possibly
     // contribute its reflection if needed.
     if (!damage_rect_in_local_space.IsEmpty()) {
       const gfx::Transform& draw_transform = render_surface->draw_transform();
       gfx::Rect damage_rect_in_target_space = MathUtil::MapEnclosingClippedRect(
           draw_transform, damage_rect_in_local_space);
       target_damage_rect->Union(damage_rect_in_target_space);
 
-      if (layer->replica_layer()) {
+      if (render_surface->HasReplica()) {
         const gfx::Transform& replica_draw_transform =
             render_surface->replica_draw_transform();
         target_damage_rect->Union(MathUtil::MapEnclosingClippedRect(
             replica_draw_transform, damage_rect_in_local_space));
       }
     }
   }
 
   // If there was damage on the replica's mask, then the target surface receives
   // that damage as well.
-  if (layer->replica_layer() && layer->replica_layer()->mask_layer()) {
-    LayerImpl* replica_mask_layer = layer->replica_layer()->mask_layer();
+  if (render_surface->HasReplicaMask()) {
+    LayerImpl* replica_mask_layer = render_surface->ReplicaMaskLayer();
 
     bool replica_is_new = false;
     LayerRectMapData& data =
         RectDataForLayer(replica_mask_layer->id(), &replica_is_new);
 
     const gfx::Transform& replica_draw_transform =
         render_surface->replica_draw_transform();
     gfx::Rect replica_mask_layer_rect = MathUtil::MapEnclosingClippedRect(
         replica_draw_transform, gfx::Rect(replica_mask_layer->bounds()));
     data.Update(replica_mask_layer_rect, mailboxId_);
@@ skipping 13 matching lines @@
   // one in them. This means we need to redraw any pixels in the surface being
   // used for the blur in this layer this frame.
   if (layer->background_filters().HasFilterThatMovesPixels()) {
     ExpandDamageRectInsideRectWithFilters(target_damage_rect,
                                           surface_rect_in_target_space,
                                           layer->background_filters());
   }
 }
 
 }  // namespace cc