Adding momentum/overscroll to views:: ScrollViews

cc/trees/transform_node.cc

Index: cc/trees/transform_node.cc
diff --git a/cc/trees/transform_node.cc b/cc/trees/transform_node.cc
index 34dd9af559fc1794c303f866f99005321c2581dd..5102969630c13e18b3a4310be3e3cd860a67e58d 100644
--- a/cc/trees/transform_node.cc
+++ b/cc/trees/transform_node.cc
@@ -77,7 +77,7 @@ bool TransformNode::operator==(const TransformNode& other) const {
          transform_changed == other.transform_changed &&
          post_local_scale_factor == other.post_local_scale_factor &&
          surface_contents_scale == other.surface_contents_scale &&
-         scroll_offset == other.scroll_offset &&
+         scroll_offset_with_overscroll == other.scroll_offset_with_overscroll &&
          scroll_snap == other.scroll_snap &&
          source_offset == other.source_offset &&
          source_to_parent == other.source_to_parent;
@@ -155,7 +155,8 @@ void TransformNode::ToProtobuf(proto::TreeNode* proto) const {
 
   Vector2dFToProto(surface_contents_scale,
                    data->mutable_surface_contents_scale());
-  ScrollOffsetToProto(scroll_offset, data->mutable_scroll_offset());
+  ScrollOffsetToProto(scroll_offset_with_overscroll,
+                      data->mutable_scroll_offset());
   Vector2dFToProto(scroll_snap, data->mutable_scroll_snap());
   Vector2dFToProto(source_offset, data->mutable_source_offset());
   Vector2dFToProto(source_to_parent, data->mutable_source_to_parent());
@@ -213,7 +214,7 @@ void TransformNode::FromProtobuf(const proto::TreeNode& proto) {
   post_local_scale_factor = data.post_local_scale_factor();
 
   surface_contents_scale = ProtoToVector2dF(data.surface_contents_scale());
-  scroll_offset = ProtoToScrollOffset(data.scroll_offset());
+  scroll_offset_with_overscroll = ProtoToScrollOffset(data.scroll_offset());
   scroll_snap = ProtoToVector2dF(data.scroll_snap());
   source_offset = ProtoToVector2dF(data.source_offset());
   source_to_parent = ProtoToVector2dF(data.source_to_parent());