Delete LayerImpl::GetRenderSurface.

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_surface_impl.h"
 #include "cc/quads/shared_quad_state.h"
 #include "cc/test/fake_compositor_frame_sink.h"
 #include "cc/test/fake_impl_task_runner_provider.h"
 #include "cc/test/fake_layer_tree_host_impl.h"
 #include "cc/test/geometry_test_utils.h"
+#include "cc/test/layer_test_common.h"
 #include "cc/test/mock_occlusion_tracker.h"
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/trees/layer_tree_impl.h"
 #include "cc/trees/single_thread_proxy.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gfx/transform.h"
 
 namespace cc {
 namespace {
@@ skipping 23 matching lines @@
   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.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()->GetRenderSurface();
+      GetRenderSurface(host_impl.active_tree()->root_layer_for_testing());
   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()->SetOpacityMutated(
       host_impl.active_tree()->root_layer_for_testing()->element_id(), 0.5f);
@@ skipping 39 matching lines @@
   owning_layer->test_properties()->blend_mode = blend_mode;
 
   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)->GetRenderSurface());
+      GetRenderSurface(host_impl.active_tree()->LayerById(owning_layer_id)));
   RenderSurfaceImpl* render_surface =
-      host_impl.active_tree()->LayerById(owning_layer_id)->GetRenderSurface();
+      GetRenderSurface(host_impl.active_tree()->LayerById(owning_layer_id));
 
   gfx::Rect content_rect(0, 0, 50, 50);
   gfx::Rect clip_rect(5, 5, 40, 40);
   gfx::Transform origin;
   origin.Translate(30, 40);
 
   render_surface->SetContentRectForTesting(content_rect);
   render_surface->SetClipRect(clip_rect);
   render_surface->SetDrawOpacity(1.f);
   render_surface->SetDrawTransform(origin);
@@ skipping 35 matching lines @@
   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)->GetRenderSurface());
+      GetRenderSurface(host_impl.active_tree()->LayerById(owning_layer_id)));
   RenderSurfaceImpl* render_surface =
-      host_impl.active_tree()->LayerById(owning_layer_id)->GetRenderSurface();
+      GetRenderSurface(host_impl.active_tree()->LayerById(owning_layer_id));
 
   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);
 
   auto pass = render_surface->CreateRenderPass();
 
   EXPECT_EQ(2, pass->id);
   EXPECT_EQ(content_rect, pass->output_rect);
   EXPECT_EQ(origin, pass->transform_to_root_target);
 }
 
 }  // namespace
 }  // namespace cc