cc: Move render surface ownership from layers 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 13 matching lines @@
 #include "cc/trees/effect_node.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/occlusion.h"
 #include "cc/trees/transform_node.h"
 #include "third_party/skia/include/core/SkImageFilter.h"
 #include "ui/gfx/geometry/rect_conversions.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
 
-RenderSurfaceImpl::RenderSurfaceImpl(LayerImpl* owning_layer)
-    : layer_tree_impl_(owning_layer->layer_tree_impl()),
-      stable_effect_id_(owning_layer->id()),
+RenderSurfaceImpl::RenderSurfaceImpl(LayerTreeImpl* layer_tree_impl,
+                                     int stable_effect_id)
+    : layer_tree_impl_(layer_tree_impl),
+      stable_effect_id_(stable_effect_id),
       effect_tree_index_(EffectTree::kInvalidNodeId),
       surface_property_changed_(false),
       ancestor_property_changed_(false),
       contributes_to_drawn_surface_(false),
       nearest_occlusion_immune_ancestor_(nullptr),
       target_render_surface_layer_index_history_(0),
       current_layer_index_history_(0) {
   damage_tracker_ = DamageTracker::Create();
 }
 
 RenderSurfaceImpl::~RenderSurfaceImpl() {}
 
 RenderSurfaceImpl* RenderSurfaceImpl::render_target() {
   EffectTree& effect_tree = layer_tree_impl_->property_trees()->effect_tree;
   EffectNode* node = effect_tree.Node(EffectTreeIndex());
-  EffectNode* target_node = effect_tree.Node(node->target_id);
-  if (target_node->id != EffectTree::kRootNodeId)
-    return target_node->render_surface;
+  if (node->target_id != EffectTree::kRootNodeId)
+    return effect_tree.GetRenderSurface(node->target_id);
   else
     return this;
 }
 
 const RenderSurfaceImpl* RenderSurfaceImpl::render_target() const {
   const EffectTree& effect_tree =
       layer_tree_impl_->property_trees()->effect_tree;
   const EffectNode* node = effect_tree.Node(EffectTreeIndex());
-  const EffectNode* target_node = effect_tree.Node(node->target_id);
-  if (target_node->id != EffectTree::kRootNodeId)
-    return target_node->render_surface;
+  if (node->target_id != EffectTree::kRootNodeId)
+    return effect_tree.GetRenderSurface(node->target_id);
   else
     return this;
 }
 
 RenderSurfaceImpl::DrawProperties::DrawProperties() {
   draw_opacity = 1.f;
   is_clipped = false;
 }
 
 RenderSurfaceImpl::DrawProperties::~DrawProperties() {}
@@ skipping 342 matching lines @@
   }
 
   RenderPassDrawQuad* quad =
       render_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
   quad->SetNew(shared_quad_state, content_rect(), visible_layer_rect,
                GetRenderPassId(), mask_resource_id, mask_uv_scale,
                mask_texture_size, surface_contents_scale, FiltersOrigin());
 }
 
 }  // namespace cc