Delete LayerImpl::GetRenderSurface.

cc/layers/layer_position_constraint_unittest.cc

 // Copyright 2013 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/layer_position_constraint.h"
 
 #include <vector>
 
 #include "cc/animation/animation_host.h"
 #include "cc/layers/layer.h"
 #include "cc/layers/layer_impl.h"
 #include "cc/test/fake_layer_tree_host.h"
 #include "cc/test/fake_proxy.h"
 #include "cc/test/geometry_test_utils.h"
+#include "cc/test/layer_test_common.h"
 #include "cc/test/test_task_graph_runner.h"
 #include "cc/trees/layer_tree_host_common.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
 class LayerWithForcedDrawsContent : public Layer {
  public:
   LayerWithForcedDrawsContent() {}
@@ skipping 419 matching lines @@
   // Case 1: scroll delta of 0, 0
   SetScrollOffsetDelta(child_impl_, gfx::Vector2d(0, 0));
   ExecuteCalculateDrawProperties(root_impl_);
 
   gfx::Transform expected_child_transform;
   gfx::Transform expected_surface_draw_transform;
   expected_surface_draw_transform.Translate(8.0, 6.0);
   gfx::Transform expected_grand_child_transform;
   gfx::Transform expected_great_grand_child_transform;
   expected_great_grand_child_transform.PreconcatTransform(rotation_about_z);
-  EXPECT_TRUE(grand_child_impl_->GetRenderSurface());
+  EXPECT_TRUE(GetRenderSurface(grand_child_impl_));
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_surface_draw_transform,
-      grand_child_impl_->GetRenderSurface()->draw_transform());
+      GetRenderSurface(grand_child_impl_)->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
                                   grand_child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_great_grand_child_transform,
                                   great_grand_child_impl_->DrawTransform());
 
   // Case 2: scroll delta of 10, 30
   SetScrollOffsetDelta(child_impl_, gfx::Vector2d(10, 30));
   child_impl_->SetDrawsContent(true);
   ExecuteCalculateDrawProperties(root_impl_);
 
@@ skipping 11 matching lines @@
   expected_surface_draw_transform.MakeIdentity();
   expected_surface_draw_transform.Translate(-10.0, -30.0);  // scroll delta
   expected_surface_draw_transform.Translate(8.0, 6.0);
 
   expected_great_grand_child_transform.MakeIdentity();
   // explicit canceling out the scroll delta that gets embedded in the fixed
   // position layer's surface.
   expected_great_grand_child_transform.Translate(10.0, 30.0);
   expected_great_grand_child_transform.PreconcatTransform(rotation_about_z);
 
-  EXPECT_TRUE(grand_child_impl_->GetRenderSurface());
+  EXPECT_TRUE(GetRenderSurface(grand_child_impl_));
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_surface_draw_transform,
-      grand_child_impl_->GetRenderSurface()->draw_transform());
+      GetRenderSurface(grand_child_impl_)->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
                                   grand_child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_great_grand_child_transform,
                                   great_grand_child_impl_->DrawTransform());
 
   // Case 3: fixed-container size delta of 20, 20
   outer_viewport_container_layer_impl_->SetViewportBoundsDelta(
       gfx::Vector2d(20, 20));
   ExecuteCalculateDrawProperties(root_impl_);
 
@@ skipping 83 matching lines @@
   gfx::Transform expected_grand_child_transform;
 
   gfx::Transform expected_great_grand_child_surface_draw_transform;
   expected_great_grand_child_surface_draw_transform.Translate(40.0, 60.0);
 
   gfx::Transform expected_great_grand_child_transform;
 
   gfx::Transform expected_fixed_position_child_transform;
   expected_fixed_position_child_transform.PreconcatTransform(rotation_about_z);
 
-  EXPECT_TRUE(grand_child_impl_->GetRenderSurface());
-  EXPECT_TRUE(great_grand_child_impl_->GetRenderSurface());
+  EXPECT_TRUE(GetRenderSurface(grand_child_impl_));
+  EXPECT_TRUE(GetRenderSurface(great_grand_child_impl_));
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_grand_child_surface_draw_transform,
-      grand_child_impl_->GetRenderSurface()->draw_transform());
+      GetRenderSurface(grand_child_impl_)->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
                                   grand_child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_great_grand_child_surface_draw_transform,
-      great_grand_child_impl_->GetRenderSurface()->draw_transform());
+      GetRenderSurface(great_grand_child_impl_)->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_great_grand_child_transform,
                                   great_grand_child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_fixed_position_child_transform,
                                   fixed_position_child_impl->DrawTransform());
 
   // Case 2: scroll delta of 10, 30
   SetScrollOffsetDelta(child_impl_, gfx::Vector2d(10, 30));
   ExecuteCalculateDrawProperties(root_impl_);
 
   expected_child_transform.MakeIdentity();
   expected_child_transform.Translate(-10.0, -30.0);  // scroll delta
 
   expected_grand_child_surface_draw_transform.MakeIdentity();
   expected_grand_child_surface_draw_transform.Translate(-10.0,
                                                         -30.0);  // scroll delta
   expected_grand_child_surface_draw_transform.Translate(8.0, 6.0);
 
   // grand_child, great_grand_child, and great_grand_child's surface are not
   // expected to change, since they are all not fixed, and they are all drawn
   // with respect to grand_child's surface that already has the scroll delta
   // accounted for.
 
   // But the great-great grandchild, "fixed_position_child", should have a
   // transform that explicitly cancels out the scroll delta.
   expected_fixed_position_child_transform.MakeIdentity();
   expected_fixed_position_child_transform.Translate(10.0, 30.0);
   expected_fixed_position_child_transform.PreconcatTransform(rotation_about_z);
 
-  EXPECT_TRUE(grand_child_impl_->GetRenderSurface());
-  EXPECT_TRUE(great_grand_child_impl_->GetRenderSurface());
+  EXPECT_TRUE(GetRenderSurface(grand_child_impl_));
+  EXPECT_TRUE(GetRenderSurface(great_grand_child_impl_));
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_grand_child_surface_draw_transform,
-      grand_child_impl_->GetRenderSurface()->draw_transform());
+      GetRenderSurface(grand_child_impl_)->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
                                   grand_child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_great_grand_child_surface_draw_transform,
-      great_grand_child_impl_->GetRenderSurface()->draw_transform());
+      GetRenderSurface(great_grand_child_impl_)->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_great_grand_child_transform,
                                   great_grand_child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_fixed_position_child_transform,
                                   fixed_position_child_impl->DrawTransform());
 
   // Case 3: fixed-container size delta of 20, 20
   outer_viewport_container_layer_impl_->SetViewportBoundsDelta(
       gfx::Vector2d(20, 20));
   ExecuteCalculateDrawProperties(root_impl_);
 
@@ skipping 92 matching lines @@
   gfx::Transform expected_grand_child_transform;
 
   gfx::Transform expected_great_grand_child_surface_draw_transform;
   expected_great_grand_child_surface_draw_transform.Translate(40.0, 60.0);
 
   gfx::Transform expected_great_grand_child_transform;
 
   gfx::Transform expected_fixed_position_child_transform;
   expected_fixed_position_child_transform.PreconcatTransform(rotation_about_z);
 
-  EXPECT_TRUE(grand_child_impl_->GetRenderSurface());
-  EXPECT_TRUE(great_grand_child_impl_->GetRenderSurface());
+  EXPECT_TRUE(GetRenderSurface(grand_child_impl_));
+  EXPECT_TRUE(GetRenderSurface(great_grand_child_impl_));
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_grand_child_surface_draw_transform,
-      grand_child_impl_->GetRenderSurface()->draw_transform());
+      GetRenderSurface(grand_child_impl_)->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
                                   grand_child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_great_grand_child_surface_draw_transform,
-      great_grand_child_impl_->GetRenderSurface()->draw_transform());
+      GetRenderSurface(great_grand_child_impl_)->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_great_grand_child_transform,
                                   great_grand_child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_fixed_position_child_transform,
                                   fixed_position_child_impl->DrawTransform());
 
   // Case 2: scroll delta of 10, 30
   SetScrollOffsetDelta(child_impl_, gfx::Vector2d(10, 30));
   ExecuteCalculateDrawProperties(root_impl_);
 
   expected_child_transform.MakeIdentity();
@@ skipping 13 matching lines @@
   // accounted for.
 
   // But the great-great grandchild, "fixed_position_child", should have a
   // transform that explicitly cancels out the scroll delta.
   expected_fixed_position_child_transform.MakeIdentity();
   // explicit canceling out the scroll delta that gets embedded in the fixed
   // position layer's surface.
   expected_fixed_position_child_transform.Translate(10.0, 30.0);
   expected_fixed_position_child_transform.PreconcatTransform(rotation_about_z);
 
-  EXPECT_TRUE(grand_child_impl_->GetRenderSurface());
-  EXPECT_TRUE(great_grand_child_impl_->GetRenderSurface());
+  EXPECT_TRUE(GetRenderSurface(grand_child_impl_));
+  EXPECT_TRUE(GetRenderSurface(great_grand_child_impl_));
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_grand_child_surface_draw_transform,
-      grand_child_impl_->GetRenderSurface()->draw_transform());
+      GetRenderSurface(grand_child_impl_)->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
                                   grand_child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_great_grand_child_surface_draw_transform,
-      great_grand_child_impl_->GetRenderSurface()->draw_transform());
+      GetRenderSurface(great_grand_child_impl_)->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_great_grand_child_transform,
                                   great_grand_child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_fixed_position_child_transform,
                                   fixed_position_child_impl->DrawTransform());
 }
 
 TEST_F(LayerPositionConstraintTest,
      ScrollCompensationForFixedPositionLayerWithContainerLayerThatHasSurface) {
   // This test checks for correct scroll compensation when the fixed-position
   // container itself has a render surface. In this case, the container layer
   // should be treated like a layer that contributes to a render target, and
   // that render target is completely irrelevant; it should not affect the
   // scroll compensation.
   child_->SetIsContainerForFixedPositionLayers(true);
   child_->SetForceRenderSurfaceForTesting(true);
   grand_child_->SetPositionConstraint(fixed_to_top_left_);
 
   CommitAndUpdateImplPointers();
 
   // Case 1: scroll delta of 0, 0
   SetScrollOffsetDelta(child_impl_, gfx::Vector2d(0, 0));
   ExecuteCalculateDrawProperties(root_impl_);
 
   gfx::Transform expected_surface_draw_transform;
   gfx::Transform expected_child_transform;
   gfx::Transform expected_grand_child_transform;
-  EXPECT_TRUE(child_impl_->GetRenderSurface());
+  EXPECT_TRUE(GetRenderSurface(child_impl_));
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_surface_draw_transform,
-      child_impl_->GetRenderSurface()->draw_transform());
+      GetRenderSurface(child_impl_)->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
                                   grand_child_impl_->DrawTransform());
 
   // Case 2: scroll delta of 10, 10
   SetScrollOffsetDelta(child_impl_, gfx::Vector2d(10, 10));
   ExecuteCalculateDrawProperties(root_impl_);
 
   // The surface is translated by scroll delta, the child transform doesn't
   // change because it scrolls along with the surface, but the fixed position
   // grand_child needs to compensate for the scroll translation.
   expected_surface_draw_transform.MakeIdentity();
   expected_surface_draw_transform.Translate(-10.0, -10.0);
   expected_grand_child_transform.MakeIdentity();
   expected_grand_child_transform.Translate(10.0, 10.0);
 
-  EXPECT_TRUE(child_impl_->GetRenderSurface());
+  EXPECT_TRUE(GetRenderSurface(child_impl_));
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_surface_draw_transform,
-      child_impl_->GetRenderSurface()->draw_transform());
+      GetRenderSurface(child_impl_)->draw_transform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
                                   grand_child_impl_->DrawTransform());
 
   // Case 3: fixed-container size delta of 20, 20
   outer_viewport_container_layer_impl_->SetViewportBoundsDelta(
       gfx::Vector2d(20, 20));
   ExecuteCalculateDrawProperties(root_impl_);
 
@@ skipping 262 matching lines @@
   expected_fixed_child_transform.Translate(20.0, 20.0);
 
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_scroll_layer_transform,
                                   scroll_layer_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_fixed_child_transform,
                                   fixed_child_impl->DrawTransform());
 }
 
 }  // namespace
 }  // namespace cc