Delete LayerImpl::GetRenderSurface.

cc/trees/layer_tree_host_unittest_occlusion.cc

 // Copyright 2012 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/trees/layer_tree_host.h"
 
 #include "cc/layers/layer.h"
 #include "cc/layers/picture_layer.h"
 #include "cc/test/fake_content_layer_client.h"
+#include "cc/test/layer_test_common.h"
 #include "cc/test/layer_tree_test.h"
 #include "cc/trees/layer_tree_impl.h"
 
 namespace cc {
 namespace {
 
 #define EXPECT_OCCLUSION_EQ(expected, actual)              \
   EXPECT_TRUE(expected.IsEqual(actual))                    \
       << " Expected: " << expected.ToString() << std::endl \
       << " Actual: " << actual.ToString();
@@ skipping 79 matching lines @@
 
     layer_tree_host()->SetRootLayer(root);
     LayerTreeTest::SetupTree();
   }
 
   void BeginTest() override { PostSetNeedsCommitToMainThread(); }
 
   void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
     LayerImpl* root = impl->active_tree()->root_layer_for_testing();
     LayerImpl* child = impl->active_tree()->LayerById(child_->id());
-    RenderSurfaceImpl* surface = child->GetRenderSurface();
+    RenderSurfaceImpl* surface = GetRenderSurface(child);
 
     // Verify the draw properties are valid.
     EXPECT_TRUE(root->contributes_to_drawn_render_surface());
     EXPECT_TRUE(child->contributes_to_drawn_render_surface());
-    EXPECT_TRUE(child->GetRenderSurface());
-    EXPECT_EQ(child->GetRenderSurface(), child->render_target());
+    EXPECT_TRUE(GetRenderSurface(child));
+    EXPECT_EQ(GetRenderSurface(child), child->render_target());
 
     EXPECT_OCCLUSION_EQ(
         Occlusion(surface->draw_transform(), SimpleEnclosedRegion(),
                   SimpleEnclosedRegion(gfx::Rect(13, 9, 10, 11))),
         surface->occlusion_in_content_space());
     EndTest();
   }
 
   void AfterTest() override {}
 
@@ skipping 40 matching lines @@
     layer_tree_host()->SetRootLayer(root);
     LayerTreeTest::SetupTree();
     client_.set_bounds(root->bounds());
   }
 
   void BeginTest() override { PostSetNeedsCommitToMainThread(); }
 
   void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
     LayerImpl* root = impl->active_tree()->root_layer_for_testing();
     LayerImpl* child = impl->active_tree()->LayerById(child_->id());
-    RenderSurfaceImpl* surface = child->GetRenderSurface();
+    RenderSurfaceImpl* surface = GetRenderSurface(child);
     LayerImpl* mask = surface->MaskLayer();
 
     // Verify the draw properties are valid.
     EXPECT_TRUE(root->contributes_to_drawn_render_surface());
     EXPECT_TRUE(child->contributes_to_drawn_render_surface());
-    EXPECT_TRUE(child->GetRenderSurface());
-    EXPECT_EQ(child->GetRenderSurface(), child->render_target());
+    EXPECT_TRUE(GetRenderSurface(child));
+    EXPECT_EQ(GetRenderSurface(child), child->render_target());
 
     gfx::Transform transform = surface->draw_transform();
     transform.PreconcatTransform(child->DrawTransform());
 
     EXPECT_OCCLUSION_EQ(
         Occlusion(transform, SimpleEnclosedRegion(),
                   SimpleEnclosedRegion(gfx::Rect(13, 9, 10, 11))),
         mask->draw_properties().occlusion_in_content_space);
     EndTest();
   }
@@ skipping 44 matching lines @@
 
     layer_tree_host()->SetRootLayer(root);
     LayerTreeTest::SetupTree();
     client_.set_bounds(root->bounds());
   }
 
   void BeginTest() override { PostSetNeedsCommitToMainThread(); }
 
   void DrawLayersOnThread(LayerTreeHostImpl* impl) override {
     LayerImpl* child = impl->active_tree()->LayerById(child_->id());
-    LayerImpl* mask = child->GetRenderSurface()->MaskLayer();
+    LayerImpl* mask = GetRenderSurface(child)->MaskLayer();
 
     gfx::Transform scale;
     scale.Scale(2, 2);
 
     EXPECT_OCCLUSION_EQ(
         Occlusion(scale, SimpleEnclosedRegion(),
                   SimpleEnclosedRegion(gfx::Rect(13, 15, 10, 11))),
         mask->draw_properties().occlusion_in_content_space);
     EndTest();
   }
 
   void AfterTest() override {}
 
  private:
   FakeContentLayerClient client_;
   scoped_refptr<Layer> child_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(
     LayerTreeHostOcclusionTestDrawPropertiesOnScaledMask);
 
 }  // namespace
 }  // namespace cc