cc: Move Layer Id to Node Map to Individual Property Tree Private

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 140 matching lines @@
 
 int RenderSurfaceImpl::TransformTreeIndex() const {
   return OwningEffectNode()->transform_id;
 }
 
 int RenderSurfaceImpl::ClipTreeIndex() const {
   return OwningEffectNode()->clip_id;
 }
 
 int RenderSurfaceImpl::EffectTreeIndex() const {
-  DCHECK_EQ(effect_tree_index_,
-            layer_tree_impl_->property_trees()
-                ->layer_id_to_effect_node_index[stable_effect_id_]);
+  DCHECK_EQ(
+      effect_tree_index_,
+      layer_tree_impl_->property_trees()
+          ->effect_tree.FindNodeIndexFromOwningLayerId(stable_effect_id_));
   return effect_tree_index_;
 }
 
 const EffectNode* RenderSurfaceImpl::OwningEffectNode() const {
   return layer_tree_impl_->property_trees()->effect_tree.Node(
       EffectTreeIndex());
 }
 
 void RenderSurfaceImpl::SetClipRect(const gfx::Rect& clip_rect) {
   if (clip_rect == draw_properties_.clip_rect)
@@ skipping 245 matching lines @@
   RenderPassDrawQuad* quad =
       render_pass->CreateAndAppendDrawQuad<RenderPassDrawQuad>();
   quad->SetNew(
       shared_quad_state, content_rect(), visible_layer_rect, GetRenderPassId(),
       mask_resource_id, gfx::ScaleRect(gfx::RectF(content_rect()),
                                        mask_uv_scale.x(), mask_uv_scale.y()),
       mask_texture_size, surface_contents_scale, FiltersOrigin(), gfx::RectF());
 }
 
 }  // namespace cc