Move LayerImpl's bounds_delta to property trees

cc/trees/layer_tree_host_common_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_common.h"
 
 #include <stddef.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 7325 matching lines @@
   LayerImpl* inner_scroll = layer_tree_impl->InnerViewportScrollLayer();
   LayerImpl* sticky_pos_impl = layer_tree_impl->LayerById(sticky_pos->id());
 
   // Initially the sticky element is moved to the bottom of the container.
   EXPECT_VECTOR2DF_EQ(
       gfx::Vector2dF(0.f, 70.f),
       sticky_pos_impl->ScreenSpaceTransform().To2dTranslation());
 
   // We start to hide the toolbar, but not far enough that the sticky element
   // should be moved up yet.
-  root_impl->SetBoundsDelta(gfx::Vector2dF(0.f, -10.f));
+  root_impl->SetViewportBoundsDelta(gfx::Vector2dF(0.f, -10.f));
   ExecuteCalculateDrawProperties(root_impl, 1.f, 1.f, root_impl, inner_scroll,
                                  nullptr);
   EXPECT_VECTOR2DF_EQ(
       gfx::Vector2dF(0.f, 70.f),
       sticky_pos_impl->ScreenSpaceTransform().To2dTranslation());
 
   // On hiding more of the toolbar the sticky element starts to stick.
-  root_impl->SetBoundsDelta(gfx::Vector2dF(0.f, -20.f));
+  root_impl->SetViewportBoundsDelta(gfx::Vector2dF(0.f, -20.f));
   ExecuteCalculateDrawProperties(root_impl, 1.f, 1.f, root_impl, inner_scroll,
                                  nullptr);
   EXPECT_VECTOR2DF_EQ(
       gfx::Vector2dF(0.f, 60.f),
       sticky_pos_impl->ScreenSpaceTransform().To2dTranslation());
 
   // On hiding more the sticky element stops moving as it has reached its
   // limit.
-  root_impl->SetBoundsDelta(gfx::Vector2dF(0.f, -30.f));
+  root_impl->SetViewportBoundsDelta(gfx::Vector2dF(0.f, -30.f));
   ExecuteCalculateDrawProperties(root_impl, 1.f, 1.f, root_impl, inner_scroll,
                                  nullptr);
   EXPECT_VECTOR2DF_EQ(
       gfx::Vector2dF(0.f, 60.f),
       sticky_pos_impl->ScreenSpaceTransform().To2dTranslation());
 }
 
 TEST_F(LayerTreeHostCommonTest, StickyPositionBottomOuterViewportDelta) {
   scoped_refptr<Layer> root = Layer::Create();
   scoped_refptr<Layer> scroller = Layer::Create();
@@ skipping 39 matching lines @@
   LayerImpl* sticky_pos_impl = layer_tree_impl->LayerById(sticky_pos->id());
   LayerImpl* outer_clip_impl = layer_tree_impl->LayerById(outer_clip->id());
 
   // Initially the sticky element is moved to the bottom of the container.
   EXPECT_VECTOR2DF_EQ(
       gfx::Vector2dF(0.f, 70.f),
       sticky_pos_impl->ScreenSpaceTransform().To2dTranslation());
 
   // We start to hide the toolbar, but not far enough that the sticky element
   // should be moved up yet.
-  outer_clip_impl->SetBoundsDelta(gfx::Vector2dF(0.f, -10.f));
+  outer_clip_impl->SetViewportBoundsDelta(gfx::Vector2dF(0.f, -10.f));
   ExecuteCalculateDrawProperties(root_impl, 1.f, 1.f, root_impl, inner_scroll,
                                  outer_scroll);
   EXPECT_VECTOR2DF_EQ(
       gfx::Vector2dF(0.f, 70.f),
       sticky_pos_impl->ScreenSpaceTransform().To2dTranslation());
 
   // On hiding more of the toolbar the sticky element starts to stick.
-  outer_clip_impl->SetBoundsDelta(gfx::Vector2dF(0.f, -20.f));
+  outer_clip_impl->SetViewportBoundsDelta(gfx::Vector2dF(0.f, -20.f));
   ExecuteCalculateDrawProperties(root_impl, 1.f, 1.f, root_impl, inner_scroll,
                                  outer_scroll);
 
   // On hiding more the sticky element stops moving as it has reached its
   // limit.
   EXPECT_VECTOR2DF_EQ(
       gfx::Vector2dF(0.f, 60.f),
       sticky_pos_impl->ScreenSpaceTransform().To2dTranslation());
 
-  outer_clip_impl->SetBoundsDelta(gfx::Vector2dF(0.f, -30.f));
+  outer_clip_impl->SetViewportBoundsDelta(gfx::Vector2dF(0.f, -30.f));
   ExecuteCalculateDrawProperties(root_impl, 1.f, 1.f, root_impl, inner_scroll,
                                  outer_scroll);
 
   EXPECT_VECTOR2DF_EQ(
       gfx::Vector2dF(0.f, 60.f),
       sticky_pos_impl->ScreenSpaceTransform().To2dTranslation());
 }
 
 TEST_F(LayerTreeHostCommonTest, StickyPositionLeftRight) {
   scoped_refptr<Layer> root = Layer::Create();
@@ skipping 1398 matching lines @@
 
   // Layers in the root render surface have their visible content rect clipped
   // by the viewport.
   EXPECT_EQ(gfx::Rect(768 / 2, 582 / 2), root->visible_layer_rect());
 
   // Layers drawing to a child render surface should still have their visible
   // content rect clipped by the viewport.
   EXPECT_EQ(gfx::Rect(768 / 2, 582 / 2), content->visible_layer_rect());
 }
 
-TEST_F(LayerTreeHostCommonTest, BoundsDeltaAffectVisibleContentRect) {
+TEST_F(LayerTreeHostCommonTest, ViewportBoundsDeltaAffectVisibleContentRect) {
   FakeImplTaskRunnerProvider task_runner_provider;
   TestTaskGraphRunner task_graph_runner;
   FakeLayerTreeHostImpl host_impl(&task_runner_provider, &task_graph_runner);
 
   // Set two layers: the root layer clips it's child,
   // the child draws its content.
 
   gfx::Size root_size = gfx::Size(300, 500);
 
   // Sublayer should be bigger than the root enlarged by bounds_delta.
   gfx::Size sublayer_size = gfx::Size(300, 1000);
 
   // Device viewport accomidated the root and the browser controls.
   gfx::Size device_viewport_size = gfx::Size(300, 600);
 
   host_impl.SetViewportSize(device_viewport_size);
   host_impl.active_tree()->SetRootLayerForTesting(
       LayerImpl::Create(host_impl.active_tree(), 1));
 
   LayerImpl* root = host_impl.active_tree()->root_layer_for_testing();
   root->SetBounds(root_size);
   root->SetMasksToBounds(true);
 
+  // Make root the inner viewport scroll layer. This ensures the later call to
+  // |SetViewportBoundsDelta| will be on a viewport layer.
+  host_impl.active_tree()->SetViewportLayersFromIds(
+      Layer::INVALID_ID, Layer::INVALID_ID, root->id(), Layer::INVALID_ID);
+
   root->test_properties()->AddChild(
       LayerImpl::Create(host_impl.active_tree(), 2));
 
   LayerImpl* sublayer = root->test_properties()->children[0];
   sublayer->SetBounds(sublayer_size);
   sublayer->SetDrawsContent(true);
 
   host_impl.active_tree()->BuildPropertyTreesForTesting();
 
   LayerImplList layer_impl_list;
   LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting inputs(
       root, device_viewport_size, &layer_impl_list);
 
   LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
   EXPECT_EQ(gfx::Rect(root_size), sublayer->visible_layer_rect());
 
-  root->SetBoundsDelta(gfx::Vector2dF(0.0, 50.0));
+  root->SetViewportBoundsDelta(gfx::Vector2dF(0.0, 50.0));
   LayerTreeHostCommon::CalculateDrawPropertiesForTesting(&inputs);
 
   gfx::Rect affected_by_delta(0, 0, root_size.width(),
                               root_size.height() + 50);
   EXPECT_EQ(affected_by_delta, sublayer->visible_layer_rect());
 }
 
-TEST_F(LayerTreeHostCommonTest, NodesAffectedByBoundsDeltaGetUpdated) {
+TEST_F(LayerTreeHostCommonTest, NodesAffectedByViewportBoundsDeltaGetUpdated) {
   scoped_refptr<Layer> root = Layer::Create();
   scoped_refptr<Layer> inner_viewport_container_layer = Layer::Create();
   scoped_refptr<Layer> inner_viewport_scroll_layer = Layer::Create();
   scoped_refptr<Layer> outer_viewport_container_layer = Layer::Create();
   scoped_refptr<Layer> outer_viewport_scroll_layer = Layer::Create();
 
   root->AddChild(inner_viewport_container_layer);
   inner_viewport_container_layer->AddChild(inner_viewport_scroll_layer);
   inner_viewport_scroll_layer->AddChild(outer_viewport_container_layer);
   outer_viewport_container_layer->AddChild(outer_viewport_scroll_layer);
@@ skipping 1941 matching lines @@
 
   // Check child layer draw properties.
   EXPECT_EQ(gfx::Rect(10, 10), child->visible_layer_rect());
   EXPECT_EQ(gfx::Transform(), child->DrawTransform());
   EXPECT_EQ(gfx::Rect(10, 10), child->clip_rect());
   EXPECT_EQ(gfx::Rect(10, 10), child->drawable_content_rect());
 }
 
 }  // namespace
 }  // namespace cc