cc: Remove map lookup from RenderSurfaceImpl::EffectTreeIndex

cc/layers/render_surface_unittest.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/append_quads_data.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/layers/render_pass_sink.h"
 #include "cc/layers/render_surface_impl.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/test/fake_compositor_frame_sink.h"
@@ skipping 21 matching lines @@
   code_to_test;                                                 \
   EXPECT_FALSE(render_surface->SurfacePropertyChanged())
 
 TEST(RenderSurfaceTest, VerifySurfaceChangesAreTrackedProperly) {
   //
   // This test checks that SurfacePropertyChanged() has the correct behavior.
   //
 
   FakeImplTaskRunnerProvider task_runner_provider;
   TestTaskGraphRunner task_graph_runner;
+  std::unique_ptr<CompositorFrameSink> compositor_frame_sink =
+      FakeCompositorFrameSink::Create3d();
   FakeLayerTreeHostImpl host_impl(&task_runner_provider, &task_graph_runner);
   std::unique_ptr<LayerImpl> owning_layer =
       LayerImpl::Create(host_impl.active_tree(), 1);
-  owning_layer->SetHasRenderSurface(true);
-  ASSERT_TRUE(owning_layer->render_surface());
-  RenderSurfaceImpl* render_surface = owning_layer->render_surface();
+  owning_layer->test_properties()->force_render_surface = true;
   gfx::Rect test_rect(3, 4, 5, 6);
   host_impl.active_tree()->ResetAllChangeTracking();
   host_impl.active_tree()->SetRootLayerForTesting(std::move(owning_layer));
-  host_impl.active_tree()->BuildPropertyTreesForTesting();
+  host_impl.SetVisible(true);
+  host_impl.InitializeRenderer(compositor_frame_sink.get());
+  host_impl.active_tree()->BuildLayerListAndPropertyTreesForTesting();
+  host_impl.active_tree()->UpdateDrawProperties(false /* update_lcd_text */);
+
+  RenderSurfaceImpl* render_surface =
+      host_impl.active_tree()->root_layer_for_testing()->render_surface();
+  ASSERT_TRUE(render_surface);
 
   // Currently, the content_rect, clip_rect, and
   // owning_layer->layerPropertyChanged() are the only sources of change.
   EXECUTE_AND_VERIFY_SURFACE_CHANGED(render_surface->SetClipRect(test_rect));
   EXECUTE_AND_VERIFY_SURFACE_CHANGED(
       render_surface->SetContentRectForTesting(test_rect));
 
   host_impl.active_tree()->property_trees()->effect_tree.OnOpacityAnimated(
       0.5f,
       host_impl.active_tree()->root_layer_for_testing()->effect_tree_index(),
@@ skipping 89 matching lines @@
     return render_passes_;
   }
 
  private:
   RenderPassList render_passes_;
 };
 
 TEST(RenderSurfaceTest, SanityCheckSurfaceCreatesCorrectRenderPass) {
   FakeImplTaskRunnerProvider task_runner_provider;
   TestTaskGraphRunner task_graph_runner;
+  std::unique_ptr<CompositorFrameSink> compositor_frame_sink =
+      FakeCompositorFrameSink::Create3d();
   FakeLayerTreeHostImpl host_impl(&task_runner_provider, &task_graph_runner);
   std::unique_ptr<LayerImpl> root_layer =
       LayerImpl::Create(host_impl.active_tree(), 1);
 
+  int owning_layer_id = 2;
   std::unique_ptr<LayerImpl> owning_layer =
-      LayerImpl::Create(host_impl.active_tree(), 2);
-  owning_layer->SetHasRenderSurface(true);
-  ASSERT_TRUE(owning_layer->render_surface());
-  RenderSurfaceImpl* render_surface = owning_layer->render_surface();
+      LayerImpl::Create(host_impl.active_tree(), owning_layer_id);
+  owning_layer->test_properties()->force_render_surface = true;
 
   root_layer->test_properties()->AddChild(std::move(owning_layer));
   host_impl.active_tree()->SetRootLayerForTesting(std::move(root_layer));
+  host_impl.SetVisible(true);
+  host_impl.InitializeRenderer(compositor_frame_sink.get());
   host_impl.active_tree()->BuildLayerListAndPropertyTreesForTesting();
+  host_impl.active_tree()->UpdateDrawProperties(false /* update_lcd_text */);
+
+  ASSERT_TRUE(
+      host_impl.active_tree()->LayerById(owning_layer_id)->render_surface());
+  RenderSurfaceImpl* render_surface =
+      host_impl.active_tree()->LayerById(owning_layer_id)->render_surface();
 
   gfx::Rect content_rect(0, 0, 50, 50);
   gfx::Transform origin;
   origin.Translate(30.0, 40.0);
 
   render_surface->SetScreenSpaceTransform(origin);
   render_surface->SetContentRectForTesting(content_rect);
 
   TestRenderPassSink pass_sink;
 
   render_surface->AppendRenderPasses(&pass_sink);
 
   ASSERT_EQ(1u, pass_sink.RenderPasses().size());
   RenderPass* pass = pass_sink.RenderPasses()[0].get();
 
   EXPECT_EQ(2, pass->id);
   EXPECT_EQ(content_rect, pass->output_rect);
   EXPECT_EQ(origin, pass->transform_to_root_target);
 }
 
 }  // namespace
 }  // namespace cc