Remove SetFixedContainerSizeDelta from LayerPositionConstraintUnittest

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"
@@ skipping 189 matching lines @@
   static void SetScrollOffsetDelta(LayerImpl* layer_impl,
                                    const gfx::Vector2dF& delta) {
     if (layer_impl->layer_tree_impl()
             ->property_trees()
             ->scroll_tree.SetScrollOffsetDeltaForTesting(layer_impl->id(),
                                                          delta))
       layer_impl->layer_tree_impl()->DidUpdateScrollOffset(layer_impl->id());
   }
 };
 
-namespace {
-
-void SetFixedContainerSizeDelta(LayerImpl* scroll_layer,
-                                const gfx::Vector2d& delta) {
-  DCHECK(scroll_layer);
-  DCHECK(scroll_layer->scrollable());
-
-  LayerImpl* container_layer = scroll_layer->scroll_clip_layer();
-  container_layer->SetViewportBoundsDelta(delta);
-}
-}  // namespace
-
 TEST_F(LayerPositionConstraintTest,
      ScrollCompensationForFixedPositionLayerWithDirectContainer) {
   // This test checks for correct scroll compensation when the fixed-position
   // container is the direct parent of the fixed-position layer.
   child_->SetIsContainerForFixedPositionLayers(true);
   grand_child_->SetPositionConstraint(fixed_to_top_left_);
 
   CommitAndUpdateImplPointers();
 
   // Case 1: scroll delta of 0, 0
@@ skipping 17 matching lines @@
   // grand_child should not be affected.
   expected_child_transform.MakeIdentity();
   expected_child_transform.Translate(-10.0, -10.0);
 
   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
-  SetFixedContainerSizeDelta(child_impl_, gfx::Vector2d(20, 20));
+  outer_viewport_container_layer_impl_->SetViewportBoundsDelta(
+      gfx::Vector2d(20, 20));
   ExecuteCalculateDrawProperties(root_impl_);
 
   // Top-left fixed-position layer should not be affected by container size.
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
                                   grand_child_impl_->DrawTransform());
 
   // Case 4: Bottom-right fixed-position layer.
   grand_child_->SetPositionConstraint(fixed_to_bottom_right_);
   CommitAndUpdateImplPointers();
 
   SetScrollOffsetDelta(child_impl_, gfx::Vector2d(10, 10));
-  SetFixedContainerSizeDelta(child_impl_, gfx::Vector2d(20, 20));
+  outer_viewport_container_layer_impl_->SetViewportBoundsDelta(
+      gfx::Vector2d(20, 20));
   ExecuteCalculateDrawProperties(root_impl_);
 
   // Bottom-right fixed-position layer moves as container resizes.
   expected_grand_child_transform.MakeIdentity();
   // Apply size delta from the child(container) layer.
   expected_grand_child_transform.Translate(20.0, 20.0);
 
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
@@ skipping 40 matching lines @@
   expected_grand_child_transform.MakeIdentity();
   expected_grand_child_transform.Translate(-2.0, -4.0);
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   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
-  SetFixedContainerSizeDelta(child_impl_, gfx::Vector2d(20, 20));
+  outer_viewport_container_layer_impl_->SetViewportBoundsDelta(
+      gfx::Vector2d(20, 20));
   ExecuteCalculateDrawProperties(root_impl_);
 
   // Top-left fixed-position layer should not be affected by container size.
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   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 4: Bottom-right fixed-position layer.
   great_grand_child_->SetPositionConstraint(fixed_to_bottom_right_);
   CommitAndUpdateImplPointers();
   SetScrollOffsetDelta(child_impl_, gfx::Vector2d(10, 10));
-  SetFixedContainerSizeDelta(child_impl_, gfx::Vector2d(20, 20));
+  outer_viewport_container_layer_impl_->SetViewportBoundsDelta(
+      gfx::Vector2d(20, 20));
   ExecuteCalculateDrawProperties(root_impl_);
 
   // Bottom-right fixed-position layer moves as container resizes.
   expected_great_grand_child_transform.MakeIdentity();
   // Apply size delta from the child(container) layer.
   expected_great_grand_child_transform.Translate(20.0, 20.0);
   // Apply layer position from the grand child layer.
   expected_great_grand_child_transform.Translate(8.0, 6.0);
 
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
@@ skipping 141 matching lines @@
                                   child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_surface_draw_transform,
       grand_child_impl_->GetRenderSurface()->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
-  SetFixedContainerSizeDelta(child_impl_, gfx::Vector2d(20, 20));
+  outer_viewport_container_layer_impl_->SetViewportBoundsDelta(
+      gfx::Vector2d(20, 20));
   ExecuteCalculateDrawProperties(root_impl_);
 
   // Top-left fixed-position layer should not be affected by container size.
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   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 4: Bottom-right fixed-position layer.
   great_grand_child_->SetPositionConstraint(fixed_to_bottom_right_);
 
   CommitAndUpdateImplPointers();
   SetScrollOffsetDelta(child_impl_, gfx::Vector2d(10, 30));
-  SetFixedContainerSizeDelta(child_impl_, gfx::Vector2d(20, 20));
+  outer_viewport_container_layer_impl_->SetViewportBoundsDelta(
+      gfx::Vector2d(20, 20));
 
   ExecuteCalculateDrawProperties(root_impl_);
 
   // Bottom-right fixed-position layer moves as container resizes.
   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);
   // Also apply size delta in the child(container) layer space.
   expected_great_grand_child_transform.Translate(20.0, 20.0);
@@ skipping 116 matching lines @@
                                   grand_child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_great_grand_child_surface_draw_transform,
       great_grand_child_impl_->GetRenderSurface()->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
-  SetFixedContainerSizeDelta(child_impl_, gfx::Vector2d(20, 20));
+  outer_viewport_container_layer_impl_->SetViewportBoundsDelta(
+      gfx::Vector2d(20, 20));
   ExecuteCalculateDrawProperties(root_impl_);
 
   // Top-left fixed-position layer should not be affected by container size.
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   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());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_fixed_position_child_transform,
                                   fixed_position_child_impl->DrawTransform());
 
   // Case 4: Bottom-right fixed-position layer.
   fixed_position_child->SetPositionConstraint(fixed_to_bottom_right_);
   CommitAndUpdateImplPointers();
   fixed_position_child_impl =
       layer_tree_impl_->LayerById(fixed_position_child->id());
   SetScrollOffsetDelta(child_impl_, gfx::Vector2d(10, 30));
-  SetFixedContainerSizeDelta(child_impl_, gfx::Vector2d(20, 20));
+  outer_viewport_container_layer_impl_->SetViewportBoundsDelta(
+      gfx::Vector2d(20, 20));
   ExecuteCalculateDrawProperties(root_impl_);
 
   // Bottom-right fixed-position layer moves as container resizes.
   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);
   // Also apply size delta in the child(container) layer space.
   expected_fixed_position_child_transform.Translate(20.0, 20.0);
   expected_fixed_position_child_transform.PreconcatTransform(rotation_about_z);
@@ skipping 178 matching lines @@
   EXPECT_TRUE(child_impl_->GetRenderSurface());
   EXPECT_TRANSFORMATION_MATRIX_EQ(
       expected_surface_draw_transform,
       child_impl_->GetRenderSurface()->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
-  SetFixedContainerSizeDelta(child_impl_, gfx::Vector2d(20, 20));
+  outer_viewport_container_layer_impl_->SetViewportBoundsDelta(
+      gfx::Vector2d(20, 20));
   ExecuteCalculateDrawProperties(root_impl_);
 
   // Top-left fixed-position layer should not be affected by container size.
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
                                   grand_child_impl_->DrawTransform());
 
   // Case 4: Bottom-right fixed-position layer.
   grand_child_->SetPositionConstraint(fixed_to_bottom_right_);
   CommitAndUpdateImplPointers();
   SetScrollOffsetDelta(child_impl_, gfx::Vector2d(10, 10));
-  SetFixedContainerSizeDelta(child_impl_, gfx::Vector2d(20, 20));
+  outer_viewport_container_layer_impl_->SetViewportBoundsDelta(
+      gfx::Vector2d(20, 20));
   ExecuteCalculateDrawProperties(root_impl_);
 
   // Bottom-right fixed-position layer moves as container resizes.
   expected_grand_child_transform.MakeIdentity();
   // 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_grand_child_transform.Translate(10.0, 10.0);
   // Apply size delta from the child(container) layer.
   expected_grand_child_transform.Translate(20.0, 20.0);
@@ skipping 37 matching lines @@
   // Here the child is affected by scroll delta, but the fixed position
   // grand_child should not be affected.
   expected_child_transform.MakeIdentity();
   expected_child_transform.Translate(-10.0, -10.0);
   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
-  SetFixedContainerSizeDelta(child_impl_, gfx::Vector2d(20, 20));
+  outer_viewport_container_layer_impl_->SetViewportBoundsDelta(
+      gfx::Vector2d(20, 20));
   ExecuteCalculateDrawProperties(root_impl_);
 
   // Top-left fixed-position layer should not be affected by container size.
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_grand_child_transform,
                                   grand_child_impl_->DrawTransform());
 
   // Case 4: Bottom-right fixed-position layer.
   grand_child_->SetPositionConstraint(fixed_to_bottom_right_);
   CommitAndUpdateImplPointers();
   SetScrollOffsetDelta(child_impl_, gfx::Vector2d(10, 10));
-  SetFixedContainerSizeDelta(child_impl_, gfx::Vector2d(20, 20));
+  outer_viewport_container_layer_impl_->SetViewportBoundsDelta(
+      gfx::Vector2d(20, 20));
 
   ExecuteCalculateDrawProperties(root_impl_);
 
   // Bottom-right fixed-position layer moves as container resizes.
   expected_grand_child_transform.MakeIdentity();
   // Apply size delta from the child(container) layer.
   expected_grand_child_transform.Translate(20.0, 20.0);
 
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
@@ skipping 33 matching lines @@
 
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_child_transform,
                                   child_impl_->DrawTransform());
   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: sizeDelta
   SetScrollOffsetDelta(child_impl_, gfx::Vector2d(0, 0));
-  SetFixedContainerSizeDelta(child_impl_, gfx::Vector2d(20, 20));
+  outer_viewport_container_layer_impl_->SetViewportBoundsDelta(
+      gfx::Vector2d(20, 20));
   ExecuteCalculateDrawProperties(root_impl_);
 
   expected_child_transform.MakeIdentity();
 
   expected_grand_child_transform.MakeIdentity();
 
   // Fixed to bottom-right, size-delta compensation is applied.
   expected_great_grand_child_transform.MakeIdentity();
   expected_great_grand_child_transform.Translate(20.0, 20.0);
 
@@ skipping 74 matching lines @@
   fixed_child->SetPositionConstraint(fixed_to_top_left_);
 
   CommitAndUpdateImplPointers();
 
   LayerImpl* fixed_child_impl =
       root_impl_->layer_tree_impl()->FindActiveTreeLayerById(fixed_child->id());
 
   // Case 1: fixed-container size delta of 20, 20
   SetScrollOffsetDelta(scroll_layer_impl_, gfx::Vector2d(10, 10));
   scroll_layer_impl_->SetDrawsContent(true);
-  SetFixedContainerSizeDelta(scroll_layer_impl_, gfx::Vector2d(20, 20));
+  inner_viewport_container_layer_impl_->SetViewportBoundsDelta(
+      gfx::Vector2d(20, 20));
   gfx::Transform expected_scroll_layer_transform;
   expected_scroll_layer_transform.Translate(-10.0, -10.0);
   gfx::Transform expected_fixed_child_transform;
 
   ExecuteCalculateDrawProperties(root_impl_);
 
   // Top-left fixed-position layer should not be affected by container size.
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_scroll_layer_transform,
                                   scroll_layer_impl_->DrawTransform());
   EXPECT_TRANSFORMATION_MATRIX_EQ(expected_fixed_child_transform,
                                   fixed_child_impl->DrawTransform());
 
   // Case 2: Bottom-right fixed-position layer.
   fixed_child->SetPositionConstraint(fixed_to_bottom_right_);
   CommitAndUpdateImplPointers();
   fixed_child_impl =
       root_impl_->layer_tree_impl()->FindActiveTreeLayerById(fixed_child->id());
 
   SetScrollOffsetDelta(scroll_layer_impl_, gfx::Vector2d(10, 10));
-  SetFixedContainerSizeDelta(scroll_layer_impl_, gfx::Vector2d(20, 20));
+  inner_viewport_container_layer_impl_->SetViewportBoundsDelta(
+      gfx::Vector2d(20, 20));
   ExecuteCalculateDrawProperties(root_impl_);
 
   // Bottom-right fixed-position layer moves as container resizes.
   expected_fixed_child_transform.MakeIdentity();
   // Apply size delta.
   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