Overscroll and Elasticity for views::ScrollView

cc/trees/property_tree_unittest.cc

 // Copyright 2014 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/property_tree.h"
 
 #include "cc/input/main_thread_scrolling_reason.h"
 #include "cc/proto/property_tree.pb.h"
 #include "cc/test/geometry_test_utils.h"
 #include "cc/trees/clip_node.h"
@@ skipping 25 matching lines @@
   original.flattens_inherited_transform = false;
   original.node_and_ancestors_are_flat = false;
   original.node_and_ancestors_have_only_integer_translation = false;
   original.scrolls = false;
   original.affected_by_inner_viewport_bounds_delta_x = false;
   original.affected_by_inner_viewport_bounds_delta_y = false;
   original.affected_by_outer_viewport_bounds_delta_x = false;
   original.affected_by_outer_viewport_bounds_delta_y = false;
   original.in_subtree_of_page_scale_layer = false;
   original.post_local_scale_factor = 0.5f;
-  original.scroll_offset = gfx::ScrollOffset(1.5f, 1.5f);
+  original.scroll_offset_with_overscroll = gfx::ScrollOffset(1.5f, 1.5f);
   original.snap_amount = gfx::Vector2dF(0.4f, 0.4f);
   original.source_offset = gfx::Vector2dF(2.5f, 2.4f);
   original.source_to_parent = gfx::Vector2dF(3.2f, 3.2f);
 
   proto::TreeNode proto;
   original.ToProtobuf(&proto);
   TransformNode result;
   result.FromProtobuf(proto);
 
   EXPECT_EQ(original, result);
@@ skipping 184 matching lines @@
   property_trees.is_main_thread = true;
   ScrollTree& original = property_trees.scroll_tree;
   ScrollNode second;
   second.owner_id = 10;
   second.scrollable = true;
   second.bounds = gfx::Size(15, 15);
   ScrollNode third;
   third.owner_id = 20;
   third.contains_non_fast_scrollable_region = true;
 
+  const gfx::ScrollOffset offset(1, 2);
+  const gfx::ScrollOffset overscroll(3, 4);
+
   original.Insert(second, 0);
   original.Insert(third, 1);
 
   original.set_currently_scrolling_node(1);
-  original.SetScrollOffset(1, gfx::ScrollOffset(1, 2));
+  original.SetScrollOffset(1, offset, overscroll);
 
   proto::PropertyTree proto;
   original.ToProtobuf(&proto);
   ScrollTree result;
   std::unordered_map<int, int> scroll_id_to_index_map;
   result.FromProtobuf(proto, &scroll_id_to_index_map);
 
   EXPECT_EQ(original, result);
   EXPECT_EQ(scroll_id_to_index_map[10], 1);
   EXPECT_EQ(scroll_id_to_index_map[20], 2);
 
   original.clear();
   original.set_currently_scrolling_node(0);
-  original.SetScrollOffset(2, gfx::ScrollOffset(1, 2));
+  original.SetScrollOffset(2, offset, overscroll);
 
   proto::PropertyTree proto2;
   original.ToProtobuf(&proto2);
   result = ScrollTree();
   scroll_id_to_index_map.clear();
   result.FromProtobuf(proto2, &scroll_id_to_index_map);
 
   EXPECT_EQ(original, result);
 }
 
@@ skipping 744 matching lines @@
 
 DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F(
     PropertyTreeTestSingularTransformSnapTest);
 
 #undef DIRECT_AND_SERIALIZED_PROPERTY_TREE_TEST_F
 #undef SERIALIZED_PROPERTY_TREE_TEST_F
 #undef DIRECT_PROPERTY_TREE_TEST_F
 
 }  // namespace
 }  // namespace cc