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

cc/layers/layer_impl.h

 // 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.
 
 #ifndef CC_LAYERS_LAYER_IMPL_H_
 #define CC_LAYERS_LAYER_IMPL_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 132 matching lines @@
   bool is_clipped() const { return draw_properties_.is_clipped; }
 
   void UpdatePropertyTreeTransform();
   void UpdatePropertyTreeTransformIsAnimated(bool is_animated);
   void UpdatePropertyTreeOpacity(float opacity);
   void UpdatePropertyTreeScrollOffset();
 
   // For compatibility with Layer.
   bool has_render_surface() const { return !!render_surface(); }
 
-  void SetMaskLayer(std::unique_ptr<LayerImpl> mask_layer);
-  LayerImpl* mask_layer() { return mask_layer_; }
-  const LayerImpl* mask_layer() const { return mask_layer_; }
-  std::unique_ptr<LayerImpl> TakeMaskLayer();
-
-  void SetReplicaLayer(std::unique_ptr<LayerImpl> replica_layer);
-  LayerImpl* replica_layer() { return replica_layer_; }
-  const LayerImpl* replica_layer() const { return replica_layer_; }
-  std::unique_ptr<LayerImpl> TakeReplicaLayerForTesting();
-
-  bool has_mask() const { return !!mask_layer_; }
-  bool has_replica() const { return !!replica_layer_; }
-  bool replica_has_mask() const {
-    return replica_layer_ && (mask_layer_ || replica_layer_->mask_layer_);
-  }
-
   LayerTreeImpl* layer_tree_impl() const { return layer_tree_impl_; }
 
   void PopulateSharedQuadState(SharedQuadState* state) const;
   void PopulateScaledSharedQuadState(SharedQuadState* state, float scale) const;
   // WillDraw must be called before AppendQuads. If WillDraw returns false,
   // AppendQuads and DidDraw will not be called. If WillDraw returns true,
   // DidDraw is guaranteed to be called before another WillDraw or before
   // the layer is destroyed. To enforce this, any class that overrides
   // WillDraw/DidDraw must call the base class version only if WillDraw
   // returns true.
@@ skipping 16 matching lines @@
   virtual void NotifyTileStateChanged(const Tile* tile) {}
 
   virtual ScrollbarLayerImplBase* ToScrollbarLayer();
 
   // Returns true if this layer has content to draw.
   void SetDrawsContent(bool draws_content);
   bool DrawsContent() const { return draws_content_; }
 
   LayerImplTestProperties* test_properties() {
     if (!test_properties_)
-      test_properties_.reset(new LayerImplTestProperties());
+      test_properties_.reset(new LayerImplTestProperties(this));
     return test_properties_.get();
   }
 
   void SetBackgroundColor(SkColor background_color);
   SkColor background_color() const { return background_color_; }
   void SetSafeOpaqueBackgroundColor(SkColor background_color);
   // If contents_opaque(), return an opaque color else return a
   // non-opaque color.  Tries to return background_color(), if possible.
   SkColor SafeOpaqueBackgroundColor() const;
 
@@ skipping 277 matching lines @@
   bool was_ever_ready_since_last_transform_animation() const {
     return was_ever_ready_since_last_transform_animation_;
   }
 
   void set_was_ever_ready_since_last_transform_animation(bool was_ready) {
     was_ever_ready_since_last_transform_animation_ = was_ready;
   }
 
   void NoteLayerPropertyChanged();
 
-  void ClearLinksToOtherLayers();
-
   void SetHasWillChangeTransformHint(bool has_will_change);
   bool has_will_change_transform_hint() const {
     return has_will_change_transform_hint_;
   }
 
  protected:
   LayerImpl(LayerTreeImpl* layer_impl,
             int id,
             scoped_refptr<SyncedScrollOffset> scroll_offset);
   LayerImpl(LayerTreeImpl* layer_impl, int id);
@@ skipping 15 matching lines @@
   gfx::Rect GetScaledEnclosingRectInTargetSpace(float scale) const;
 
  private:
   void ValidateQuadResourcesInternal(DrawQuad* quad) const;
 
   virtual const char* LayerTypeAsString() const;
 
   // Properties internal to LayerImpl
   LayerImpl* parent_;
 
-  // mask_layer_ can be temporarily stolen during tree sync, we need this ID to
-  // confirm newly assigned layer is still the previous one
-  int mask_layer_id_;
-  LayerImpl* mask_layer_;
-  int replica_layer_id_;  // ditto
-  LayerImpl* replica_layer_;
   int layer_id_;
   LayerTreeImpl* layer_tree_impl_;
 
   std::unique_ptr<LayerImplTestProperties> test_properties_;
 
   gfx::Vector2dF bounds_delta_;
 
   // Properties synchronized from the associated Layer.
   gfx::Size bounds_;
   int scroll_clip_layer_id_;
@@ skipping 77 matching lines @@
 
   bool scrolls_drawn_descendant_;
   bool has_will_change_transform_hint_;
 
   DISALLOW_COPY_AND_ASSIGN(LayerImpl);
 };
 
 }  // namespace cc
 
 #endif  // CC_LAYERS_LAYER_IMPL_H_