cc: Rename LayerImpl::render_surface to GetRenderSurface

cc/trees/layer_tree_host_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/trees/layer_tree_host.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 1047 matching lines @@
     }
   }
 
   DrawResult PrepareToDrawOnThread(LayerTreeHostImpl* impl,
                                    LayerTreeHostImpl::FrameData* frame_data,
                                    DrawResult draw_result) override {
     LayerImpl* root_impl = impl->active_tree()->LayerById(root_->id());
     LayerImpl* child_impl = impl->active_tree()->LayerById(child_->id());
     switch (impl->active_tree()->source_frame_number()) {
       case 0:
-        EXPECT_TRUE(root_impl->render_surface()->AncestorPropertyChanged());
-        EXPECT_TRUE(child_impl->render_surface()->AncestorPropertyChanged());
+        EXPECT_TRUE(root_impl->GetRenderSurface()->AncestorPropertyChanged());
+        EXPECT_TRUE(child_impl->GetRenderSurface()->AncestorPropertyChanged());
         PostSetNeedsCommitToMainThread();
         break;
       case 1:
-        EXPECT_FALSE(root_impl->render_surface()->AncestorPropertyChanged());
-        EXPECT_FALSE(child_impl->render_surface()->AncestorPropertyChanged());
+        EXPECT_FALSE(root_impl->GetRenderSurface()->AncestorPropertyChanged());
+        EXPECT_FALSE(child_impl->GetRenderSurface()->AncestorPropertyChanged());
         PostSetNeedsCommitToMainThread();
         break;
       case 2:
-        EXPECT_TRUE(root_impl->render_surface()->AncestorPropertyChanged());
-        EXPECT_TRUE(child_impl->render_surface()->AncestorPropertyChanged());
+        EXPECT_TRUE(root_impl->GetRenderSurface()->AncestorPropertyChanged());
+        EXPECT_TRUE(child_impl->GetRenderSurface()->AncestorPropertyChanged());
         PostSetNeedsCommitToMainThread();
         break;
       case 3:
-        EXPECT_FALSE(root_impl->render_surface()->AncestorPropertyChanged());
-        EXPECT_TRUE(child_impl->render_surface()->AncestorPropertyChanged());
+        EXPECT_FALSE(root_impl->GetRenderSurface()->AncestorPropertyChanged());
+        EXPECT_TRUE(child_impl->GetRenderSurface()->AncestorPropertyChanged());
         EndTest();
         PostSetNeedsCommitToMainThread();
         break;
       case 4:
-        EXPECT_FALSE(root_impl->render_surface()->AncestorPropertyChanged());
-        EXPECT_FALSE(child_impl->render_surface()->AncestorPropertyChanged());
+        EXPECT_FALSE(root_impl->GetRenderSurface()->AncestorPropertyChanged());
+        EXPECT_FALSE(child_impl->GetRenderSurface()->AncestorPropertyChanged());
         EndTest();
         break;
     }
 
     return draw_result;
   }
 
   void AfterTest() override {}
 
  private:
@@ skipping 410 matching lines @@
         break;
     }
   }
 
   void CommitCompleteOnThread(LayerTreeHostImpl* impl) override {
     switch (index_) {
       case 0:
         index_++;
         EXPECT_FALSE(impl->sync_tree()
                          ->root_layer_for_testing()
-                         ->render_surface()
+                         ->GetRenderSurface()
                          ->MaskLayer());
         break;
       case 1:
         EXPECT_TRUE(impl->sync_tree()
                         ->root_layer_for_testing()
-                        ->render_surface()
+                        ->GetRenderSurface()
                         ->MaskLayer());
         EndTest();
         break;
     }
   }
 
   void AfterTest() override {}
 
   scoped_refptr<Layer> mask_layer;
   int index_;
@@ skipping 1070 matching lines @@
     // Compute all the layer transforms for the frame.
     LayerTreeHostImpl::FrameData frame_data;
     impl->PrepareToDraw(&frame_data);
     impl->DidDrawAllLayers(frame_data);
 
     const LayerImplList& render_surface_layer_list =
         *frame_data.render_surface_layer_list;
 
     // Both layers should be drawing into the root render surface.
     ASSERT_EQ(1u, render_surface_layer_list.size());
-    ASSERT_EQ(root->render_surface(),
-              render_surface_layer_list[0]->render_surface());
-    ASSERT_EQ(2u, root->render_surface()->layer_list().size());
+    ASSERT_EQ(root->GetRenderSurface(),
+              render_surface_layer_list[0]->GetRenderSurface());
+    ASSERT_EQ(2u, root->GetRenderSurface()->layer_list().size());
 
     // The root render surface is the size of the viewport.
-    EXPECT_EQ(gfx::Rect(0, 0, 60, 60), root->render_surface()->content_rect());
+    EXPECT_EQ(gfx::Rect(0, 0, 60, 60),
+              root->GetRenderSurface()->content_rect());
 
     // The max tiling scale of the child should be scaled.
     EXPECT_FLOAT_EQ(1.5f, child->MaximumTilingContentsScale());
 
     gfx::Transform scale_transform;
     scale_transform.Scale(impl->active_tree()->device_scale_factor(),
                           impl->active_tree()->device_scale_factor());
 
     // The root layer is scaled by 2x.
     gfx::Transform root_screen_space_transform = scale_transform;
@@ skipping 2943 matching lines @@
     grand_child_->SetForceRenderSurfaceForTesting(true);
 
     LayerTreeHostTest::SetupTree();
   }
 
   void CommitCompleteOnThread(LayerTreeHostImpl* host_impl) override {
     if (host_impl->sync_tree()->source_frame_number() >= 1) {
       LayerImpl* grand_child_impl =
           host_impl->sync_tree()->LayerById(grand_child_->id());
       EXPECT_EQ(grand_child_impl->effect_tree_index(),
-                grand_child_impl->render_surface()->EffectTreeIndex());
+                grand_child_impl->GetRenderSurface()->EffectTreeIndex());
     }
   }
 
   void DidActivateTreeOnThread(LayerTreeHostImpl* host_impl) override {
     LayerImpl* grand_child_impl =
         host_impl->active_tree()->LayerById(grand_child_->id());
     switch (host_impl->active_tree()->source_frame_number()) {
       case 0:
         PostSetNeedsCommitToMainThread();
         break;
       case 1:
       case 2:
         EXPECT_EQ(grand_child_impl->effect_tree_index(),
-                  grand_child_impl->render_surface()->EffectTreeIndex());
+                  grand_child_impl->GetRenderSurface()->EffectTreeIndex());
         PostSetNeedsCommitToMainThread();
         break;
       case 3:
         EXPECT_EQ(grand_child_impl->effect_tree_index(),
-                  grand_child_impl->render_surface()->EffectTreeIndex());
+                  grand_child_impl->GetRenderSurface()->EffectTreeIndex());
         EndTest();
     }
   }
 
   void DidCommit() override {
     switch (layer_tree_host()->SourceFrameNumber()) {
       case 2:
         // Setting an empty viewport causes draws to get skipped, so the active
         // tree won't update draw properties.
         layer_tree_host()->SetViewportSize(gfx::Size());
@@ skipping 1384 matching lines @@
     EndTest();
   }
 
   void AfterTest() override {}
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerTreeHostTestSubmitFrameResources);
 
 }  // namespace
 }  // namespace cc