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

cc/trees/draw_property_utils.cc

 // Copyright 2014 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/draw_property_utils.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 15 matching lines @@
 
 static bool IsRootLayer(const Layer* layer) {
   return !layer->parent();
 }
 
 static bool IsRootLayer(const LayerImpl* layer) {
   return layer->layer_tree_impl()->IsRootLayer(layer);
 }
 
 #if DCHECK_IS_ON()
-static LayerImpl* EffectNodeOwner(LayerImpl* layer) {
-  EffectNode* node =
-      layer->layer_tree_impl()->property_trees()->effect_tree.Node(
-          layer->effect_tree_index());
-  return layer->layer_tree_impl()->LayerById(node->owner_id);
-}
-
 static void ValidateRenderSurfaceForLayer(LayerImpl* layer) {
   // This test verifies that there are no cases where a LayerImpl needs
   // a render surface, but doesn't have one.
   if (layer->has_render_surface())
     return;
 
   DCHECK(layer->filters().IsEmpty()) << "layer: " << layer->id();
   DCHECK(layer->background_filters().IsEmpty()) << "layer: " << layer->id();
   DCHECK(!IsRootLayer(layer)) << "layer: " << layer->id();
-  if (EffectNodeOwner(layer)->replica_layer() == layer)
+  EffectNode* effect_node =
+      layer->layer_tree_impl()->property_trees()->effect_tree.Node(
+          layer->effect_tree_index());
+  if (effect_node->owner_id != layer->id())
     return;
-  DCHECK(!layer->mask_layer()) << "layer: " << layer->id();
-  DCHECK(!layer->replica_layer()) << "layer: " << layer->id();
+  DCHECK_EQ(effect_node->data.mask_layer_id, -1) << "layer: " << layer->id();
+  DCHECK_EQ(effect_node->data.replica_layer_id, -1) << "layer: " << layer->id();
 }
 
 #endif
 
 template <typename LayerType>
 bool ComputeClipRectInTargetSpace(const LayerType* layer,
                                   const ClipNode* clip_node,
                                   const TransformTree& transform_tree,
                                   int target_node_id,
                                   gfx::RectF* clip_rect_in_target_space) {
@@ skipping 1256 matching lines @@
 void UpdateElasticOverscroll(PropertyTrees* property_trees,
                              const Layer* overscroll_elasticity_layer,
                              const gfx::Vector2dF& elastic_overscroll) {
   UpdateElasticOverscrollInternal(property_trees, overscroll_elasticity_layer,
                                   elastic_overscroll);
 }
 
 }  // namespace draw_property_utils
 
 }  // namespace cc