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

cc/layers/render_surface_impl.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/layers/render_surface_impl.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 
@@ skipping 65 matching lines @@
   gfx::Rect surface_content_rect = content_rect();
   if (!owning_layer_->filters().IsEmpty()) {
     const gfx::Transform& owning_layer_draw_transform =
         owning_layer_->DrawTransform();
     DCHECK(owning_layer_draw_transform.IsScale2d());
     surface_content_rect = owning_layer_->filters().MapRect(
         surface_content_rect, owning_layer_draw_transform.matrix());
   }
   gfx::RectF drawable_content_rect = MathUtil::MapClippedRect(
       draw_transform(), gfx::RectF(surface_content_rect));
-  if (owning_layer_->has_replica()) {
+  if (HasReplica()) {
     drawable_content_rect.Union(MathUtil::MapClippedRect(
         replica_draw_transform(), gfx::RectF(surface_content_rect)));
   } else if (!owning_layer_->filters().IsEmpty() && is_clipped()) {
     // Filter could move pixels around, but still need to be clipped.
     drawable_content_rect.Intersect(gfx::RectF(clip_rect()));
   }
 
   // If the rect has a NaN coordinate, we return empty rect to avoid crashes in
   // functions (for example, gfx::ToEnclosedRect) that are called on this rect.
   if (std::isnan(drawable_content_rect.x()) ||
@@ skipping 20 matching lines @@
 float RenderSurfaceImpl::GetReplicaDebugBorderWidth() const {
   return DebugColors::SurfaceReplicaBorderWidth(
       owning_layer_->layer_tree_impl());
 }
 
 int RenderSurfaceImpl::OwningLayerId() const {
   return owning_layer_ ? owning_layer_->id() : 0;
 }
 
 bool RenderSurfaceImpl::HasReplica() const {
-  return owning_layer_->has_replica();
+  return OwningEffectNode()->data.replica_layer_id != -1;
 }
 
 const LayerImpl* RenderSurfaceImpl::ReplicaLayer() const {
-  return owning_layer_->replica_layer();
+  int replica_layer_id = OwningEffectNode()->data.replica_layer_id;
+  return owning_layer_->layer_tree_impl()->LayerById(replica_layer_id);
+}
+
+LayerImpl* RenderSurfaceImpl::ReplicaLayer() {
+  int replica_layer_id = OwningEffectNode()->data.replica_layer_id;
+  return owning_layer_->layer_tree_impl()->LayerById(replica_layer_id);
+}
+
+LayerImpl* RenderSurfaceImpl::MaskLayer() {
+  int mask_layer_id = OwningEffectNode()->data.mask_layer_id;
+  return owning_layer_->layer_tree_impl()->LayerById(mask_layer_id);
+}
+
+bool RenderSurfaceImpl::HasMask() const {
+  return OwningEffectNode()->data.mask_layer_id != -1;
+}
+
+LayerImpl* RenderSurfaceImpl::ReplicaMaskLayer() {
+  int replica_mask_layer_id = OwningEffectNode()->data.replica_mask_layer_id;
+  return owning_layer_->layer_tree_impl()->LayerById(replica_mask_layer_id);
+}
+
+bool RenderSurfaceImpl::HasReplicaMask() const {
+  return OwningEffectNode()->data.replica_mask_layer_id != -1;
 }
 
 bool RenderSurfaceImpl::HasCopyRequest() const {
-  return owning_layer_->layer_tree_impl()
-      ->property_trees()
-      ->effect_tree.Node(EffectTreeIndex())
-      ->data.has_copy_request;
+  return OwningEffectNode()->data.has_copy_request;
 }
 
 int RenderSurfaceImpl::TransformTreeIndex() const {
   return owning_layer_->transform_tree_index();
 }
 
 int RenderSurfaceImpl::ClipTreeIndex() const {
   return owning_layer_->clip_tree_index();
 }
 
 int RenderSurfaceImpl::EffectTreeIndex() const {
   return owning_layer_->effect_tree_index();
 }
 
+const EffectNode* RenderSurfaceImpl::OwningEffectNode() const {
+  return owning_layer_->layer_tree_impl()->property_trees()->effect_tree.Node(
+      EffectTreeIndex());
+}
+
 void RenderSurfaceImpl::SetClipRect(const gfx::Rect& clip_rect) {
   if (clip_rect == draw_properties_.clip_rect)
     return;
 
   surface_property_changed_ = true;
   draw_properties_.clip_rect = clip_rect;
 }
 
 void RenderSurfaceImpl::SetContentRect(const gfx::Rect& content_rect) {
   if (content_rect == draw_properties_.content_rect)
     return;
 
   surface_property_changed_ = true;
   draw_properties_.content_rect = content_rect;
 }
 
 void RenderSurfaceImpl::SetContentRectForTesting(const gfx::Rect& rect) {
   SetContentRect(rect);
 }
 
 gfx::Rect RenderSurfaceImpl::CalculateClippedAccumulatedContentRect() {
-  if (owning_layer_->replica_layer() || HasCopyRequest() || !is_clipped())
+  if (ReplicaLayer() || HasCopyRequest() || !is_clipped())
     return accumulated_content_rect();
 
   if (accumulated_content_rect().IsEmpty())
     return gfx::Rect();
 
   // Calculate projection from the target surface rect to local
   // space. Non-invertible draw transforms means no able to bring clipped rect
   // in target space back to local space, early out without clip.
   gfx::Transform target_to_surface(gfx::Transform::kSkipInitialization);
   if (!draw_transform().GetInverse(&target_to_surface))
@@ skipping 178 matching lines @@
   RenderPassDrawQuad* quad =
       render_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
   quad->SetNew(shared_quad_state, content_rect(), visible_layer_rect,
                render_pass_id, mask_resource_id, mask_uv_scale,
                mask_texture_size, owning_layer_->filters(),
                owning_layer_to_target_scale,
                owning_layer_->background_filters());
 }
 
 }  // namespace cc