cc : Stop pushing properties not used by LayerImpl to LayerImpl. (2)

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/layers/layer.h"
 #include "cc/layers/layer_impl.h"
@@ skipping 417 matching lines @@
 }
 
 TEST_F(LayerPositionConstraintTest,
      ScrollCompensationForFixedPositionWithIntermediateSurfaceAndTransforms) {
   // This test checks for correct scroll compensation when the fixed-position
   // container contributes to a different render surface than the fixed-position
   // layer. In this case, the surface draw transforms also have to be accounted
   // for when checking the scroll delta.
   child_->SetIsContainerForFixedPositionLayers(true);
   grand_child_->SetPosition(gfx::PointF(8.f, 6.f));
-  grand_child_->SetForceRenderSurface(true);
+  grand_child_->SetForceRenderSurfaceForTesting(true);
   great_grand_child_->SetPositionConstraint(fixed_to_top_left_);
 
   gfx::Transform rotation_about_z;
   rotation_about_z.RotateAboutZAxis(90.0);
   great_grand_child_->SetTransform(rotation_about_z);
 
   CommitAndUpdateImplPointers();
 
   // Case 1: scroll delta of 0, 0
   SetScrollOffsetDelta(child_impl_, gfx::Vector2d(0, 0));
@@ skipping 103 matching lines @@
   scoped_refptr<Layer> fixed_position_child =
       make_scoped_refptr(new LayerWithForcedDrawsContent());
   SetLayerPropertiesForTesting(fixed_position_child.get(), gfx::Transform(),
                                gfx::Point3F(), gfx::PointF(),
                                gfx::Size(100, 100), true);
   great_grand_child_->AddChild(fixed_position_child);
 
   // Actually set up the scenario here.
   child_->SetIsContainerForFixedPositionLayers(true);
   grand_child_->SetPosition(gfx::PointF(8.f, 6.f));
-  grand_child_->SetForceRenderSurface(true);
+  grand_child_->SetForceRenderSurfaceForTesting(true);
   great_grand_child_->SetPosition(gfx::PointF(40.f, 60.f));
-  great_grand_child_->SetForceRenderSurface(true);
+  great_grand_child_->SetForceRenderSurfaceForTesting(true);
   fixed_position_child->SetPositionConstraint(fixed_to_top_left_);
 
   // The additional rotation, which is non-commutative with translations, helps
   // to verify that we have correct order-of-operations in the final scroll
   // compensation.  Note that rotating about the center of the layer ensures we
   // do not accidentally clip away layers that we want to test.
   gfx::Transform rotation_about_z;
   rotation_about_z.Translate(50.0, 50.0);
   rotation_about_z.RotateAboutZAxis(90.0);
   rotation_about_z.Translate(-50.0, -50.0);
@@ skipping 133 matching lines @@
   scoped_refptr<Layer> fixed_position_child =
       make_scoped_refptr(new LayerWithForcedDrawsContent());
   SetLayerPropertiesForTesting(fixed_position_child.get(), gfx::Transform(),
                                gfx::Point3F(), gfx::PointF(),
                                gfx::Size(100, 100), true);
   great_grand_child_->AddChild(fixed_position_child);
 
   // Actually set up the scenario here.
   child_transform_layer_->SetIsContainerForFixedPositionLayers(true);
   grand_child_->SetPosition(gfx::PointF(8.f, 6.f));
-  grand_child_->SetForceRenderSurface(true);
+  grand_child_->SetForceRenderSurfaceForTesting(true);
   great_grand_child_->SetPosition(gfx::PointF(40.f, 60.f));
-  great_grand_child_->SetForceRenderSurface(true);
+  great_grand_child_->SetForceRenderSurfaceForTesting(true);
   fixed_position_child->SetPositionConstraint(fixed_to_top_left_);
 
   // The additional rotations, which are non-commutative with translations, help
   // to verify that we have correct order-of-operations in the final scroll
   // compensation.  Note that rotating about the center of the layer ensures we
   // do not accidentally clip away layers that we want to test.
   gfx::Transform rotation_about_z;
   rotation_about_z.Translate(50.0, 50.0);
   rotation_about_z.RotateAboutZAxis(30.0);
   rotation_about_z.Translate(-50.0, -50.0);
@@ skipping 90 matching lines @@
 }
 
 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_->SetForceRenderSurface(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;
@@ skipping 316 matching lines @@
   VerifySerializeAndDeserializeProto(true, false, true);
   VerifySerializeAndDeserializeProto(true, false, false);
   VerifySerializeAndDeserializeProto(false, true, true);
   VerifySerializeAndDeserializeProto(false, true, false);
   VerifySerializeAndDeserializeProto(false, false, true);
   VerifySerializeAndDeserializeProto(false, false, false);
 }
 
 }  // namespace
 }  // namespace cc