Move LayerImpl's bounds_delta to property trees

cc/layers/layer_impl_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/layers/layer_impl.h"
 
 #include "cc/base/filter_operation.h"
 #include "cc/base/filter_operations.h"
 #include "cc/layers/painted_scrollbar_layer_impl.h"
 #include "cc/layers/solid_color_scrollbar_layer_impl.h"
@@ skipping 120 matching lines @@
   EXPECT_TRUE(host_impl.InitializeRenderer(compositor_frame_sink.get()));
   std::unique_ptr<LayerImpl> root_clip_ptr =
       LayerImpl::Create(host_impl.active_tree(), 1);
   LayerImpl* root_clip = root_clip_ptr.get();
   std::unique_ptr<LayerImpl> root_ptr =
       LayerImpl::Create(host_impl.active_tree(), 2);
   LayerImpl* root = root_ptr.get();
   root_clip_ptr->test_properties()->AddChild(std::move(root_ptr));
   host_impl.active_tree()->SetRootLayerForTesting(std::move(root_clip_ptr));
 
+  // Make root the inner viewport scroll layer. This ensures the later call to

[enne (OOO), 2017/04/24 18:05:08]

Should this done in FakeLayerTreeHostImpl?

[pdr., 2017/04/24 20:06:49]

I don't think so because the layers are setup in this function.
FakeLayerTreeHostImpl doesn't really know what the test wants to do with the
layers.

+  // |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()->force_render_surface = true;
   root->SetMasksToBounds(true);
   root->layer_tree_impl()->ResetAllChangeTracking();
 
   root->test_properties()->AddChild(
       LayerImpl::Create(host_impl.active_tree(), 7));
   LayerImpl* child = root->test_properties()->children[0];
   child->test_properties()->AddChild(
       LayerImpl::Create(host_impl.active_tree(), 8));
   LayerImpl* grand_child = child->test_properties()->children[0];
@@ skipping 34 matching lines @@
       host_impl.active_tree()->SetFilterMutated(root->element_id(),
                                                 FilterOperations()));
   EXECUTE_AND_VERIFY_NO_NEED_TO_PUSH_PROPERTIES_AND_SUBTREE_CHANGED(
       host_impl.active_tree()->SetOpacityMutated(root->element_id(),
                                                  arbitrary_number));
   EXECUTE_AND_VERIFY_NO_NEED_TO_PUSH_PROPERTIES_AND_SUBTREE_CHANGED(
       host_impl.active_tree()->SetTransformMutated(root->element_id(),
                                                    arbitrary_transform));
   EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->ScrollBy(arbitrary_vector2d);
                                      root->SetNeedsPushProperties());
-  // SetBoundsDelta changes subtree only when masks_to_bounds is true and it
-  // doesn't set needs_push_properties as it is always called on active tree.
+  // SetViewportBoundsDelta changes subtree only when masks_to_bounds is true
+  // and it doesn't set needs_push_properties as it is always called on active
+  // tree.
   root->SetMasksToBounds(true);
-  EXECUTE_AND_VERIFY_SUBTREE_CHANGED(root->SetBoundsDelta(arbitrary_vector2d);
-                                     root->SetNeedsPushProperties());
+  EXECUTE_AND_VERIFY_SUBTREE_CHANGED(
+      root->SetViewportBoundsDelta(arbitrary_vector2d);
+      root->SetNeedsPushProperties());
 
   // Changing these properties only affects the layer itself.
   EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(root->SetDrawsContent(true));
   EXECUTE_AND_VERIFY_ONLY_LAYER_CHANGED(
       root->SetBackgroundColor(arbitrary_color));
 
   // Special case: check that SetBounds changes behavior depending on
   // masksToBounds.
   gfx::Size bounds_size(135, 246);
   root->SetMasksToBounds(false);
@@ skipping 352 matching lines @@
 
   pending_layer->PushPropertiesTo(layer());
 
   EXPECT_VECTOR_EQ(gfx::Vector2dF(22, 23), layer()->CurrentScrollOffset());
   EXPECT_VECTOR_EQ(layer()->CurrentScrollOffset(),
                    pending_layer->CurrentScrollOffset());
 }
 
 }  // namespace
 }  // namespace cc