Delete LayerImpl::GetRenderSurface.

cc/trees/occlusion_tracker_unittest.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/occlusion_tracker.h"
 
 #include <stddef.h>
 
 #include "cc/animation/animation_host.h"
 #include "cc/base/filter_operation.h"
 #include "cc/base/filter_operations.h"
 #include "cc/base/math_util.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/output/copy_output_request.h"
 #include "cc/output/copy_output_result.h"
 #include "cc/test/animation_test_common.h"
 #include "cc/test/fake_impl_task_runner_provider.h"
 #include "cc/test/fake_layer_tree_host.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/test_occlusion_tracker.h"
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/trees/layer_tree_host_common.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 38 matching lines @@
   // layer. Simple wrapper around GetUnoccludedContentRect.
   gfx::Rect UnoccludedLayerContentRect(const LayerImpl* layer,
                                        const gfx::Rect& content_rect) const {
     DCHECK(layer->visible_layer_rect().Contains(content_rect));
     return this->GetCurrentOcclusionForLayer(layer->DrawTransform())
         .GetUnoccludedContentRect(content_rect);
   }
 
   gfx::Rect UnoccludedSurfaceContentRect(const LayerImpl* layer,
                                          const gfx::Rect& content_rect) const {
-    RenderSurfaceImpl* surface = layer->GetRenderSurface();
+    const RenderSurfaceImpl* surface = GetRenderSurface(layer);
     return this->GetCurrentOcclusionForContributingSurface(
                      surface->draw_transform())
         .GetUnoccludedContentRect(content_rect);
   }
 };
 
 class OcclusionTrackerTest : public testing::Test {
  protected:
   explicit OcclusionTrackerTest(bool opaque_layers)
       : opaque_layers_(opaque_layers),
@@ skipping 149 matching lines @@
     ++(*layer_iterator_);
   }
 
   void VisitLayer(LayerImpl* layer, OcclusionTracker* occlusion) {
     EnterLayer(layer, occlusion);
     LeaveLayer(layer, occlusion);
   }
 
   void EnterContributingSurface(LayerImpl* layer, OcclusionTracker* occlusion) {
     ASSERT_EQ(layer_iterator_->target_render_surface(),
-              layer->GetRenderSurface());
+              GetRenderSurface(layer));
     ASSERT_TRUE(layer_iterator_->state() ==
                 EffectTreeLayerListIterator::State::TARGET_SURFACE);
     occlusion->EnterLayer(*layer_iterator_);
     occlusion->LeaveLayer(*layer_iterator_);
     ++(*layer_iterator_);
     ASSERT_TRUE(layer_iterator_->state() ==
                 EffectTreeLayerListIterator::State::CONTRIBUTING_SURFACE);
     occlusion->EnterLayer(*layer_iterator_);
   }
 
   void LeaveContributingSurface(LayerImpl* layer, OcclusionTracker* occlusion) {
     ASSERT_EQ(layer_iterator_->current_render_surface(),
-              layer->GetRenderSurface());
+              GetRenderSurface(layer));
     ASSERT_TRUE(layer_iterator_->state() ==
                 EffectTreeLayerListIterator::State::CONTRIBUTING_SURFACE);
     occlusion->LeaveLayer(*layer_iterator_);
     ++(*layer_iterator_);
   }
 
   void VisitContributingSurface(LayerImpl* layer, OcclusionTracker* occlusion) {
     EnterContributingSurface(layer, occlusion);
     LeaveContributingSurface(layer, occlusion);
   }
@@ skipping 2158 matching lines @@
     EXPECT_EQ(gfx::Rect(),
               occlusion.UnoccludedSurfaceContentRect(
                   surface, gfx::Rect(80, 70, 50, 50)));
   }
 };
 
 ALL_OCCLUSIONTRACKER_TEST(OcclusionTrackerTestUnoccludedSurfaceQuery)
 
 }  // namespace
 }  // namespace cc