Overscroll and Elasticity for views::ScrollView

cc/trees/property_tree_builder.cc

Index: cc/trees/property_tree_builder.cc
diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc
index 3319146ddaa607ae364ac18e52f5e6a8aa0cccd4..9adc95e3a25bce3ebd028235b11d32bfbffb3555 100644
--- a/cc/trees/property_tree_builder.cc
+++ b/cc/trees/property_tree_builder.cc
@@ -663,10 +663,11 @@ bool AddTransformNodeIfNeeded(
 
   if (is_overscroll_elasticity_layer) {
     DCHECK(!is_scrollable);
-    node->scroll_offset =
+    node->scroll_offset_with_overscroll =
         gfx::ScrollOffset(data_from_ancestor.elastic_overscroll);
   } else if (!ScrollParent(layer)) {
-    node->scroll_offset = layer->CurrentScrollOffset();
+    node->scroll_offset_with_overscroll =
+        layer->CurrentScrollOffset() + layer->CurrentOverscroll();
   }
 
   if (is_fixed) {
@@ -1152,7 +1153,8 @@ void AddScrollNodeIfNeeded(
 
     if (node.scrollable) {
       data_for_children->property_trees->scroll_tree.SetBaseScrollOffset(
-          layer->id(), layer->CurrentScrollOffset());
+          layer->id(), layer->CurrentScrollOffset(),
+          layer->CurrentOverscroll());
     }
   }