Overscroll and Elasticity for views::ScrollView

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 bfef79fbd013837a10aa958d15a4b5368c892b2e..becac9714e13ffb34b0cbbb21205420449b0955d 100644
--- a/cc/trees/transform_node.cc
+++ b/cc/trees/transform_node.cc
@@ -77,7 +77,7 @@ bool TransformNode::operator==(const TransformNode& other) const {
              other.in_subtree_of_page_scale_layer &&
          transform_changed == other.transform_changed &&
          post_local_scale_factor == other.post_local_scale_factor &&
-         scroll_offset == other.scroll_offset &&
+         scroll_offset_with_overscroll == other.scroll_offset_with_overscroll &&
          snap_amount == other.snap_amount &&
          source_offset == other.source_offset &&
          source_to_parent == other.source_to_parent;
@@ -153,7 +153,8 @@ void TransformNode::ToProtobuf(proto::TreeNode* proto) const {
   data->set_transform_changed(transform_changed);
   data->set_post_local_scale_factor(post_local_scale_factor);
 
-  ScrollOffsetToProto(scroll_offset, data->mutable_scroll_offset());
+  ScrollOffsetToProto(scroll_offset_with_overscroll,
+                      data->mutable_scroll_offset());
   Vector2dFToProto(snap_amount, data->mutable_snap_amount());
   Vector2dFToProto(source_offset, data->mutable_source_offset());
   Vector2dFToProto(source_to_parent, data->mutable_source_to_parent());
@@ -210,7 +211,7 @@ void TransformNode::FromProtobuf(const proto::TreeNode& proto) {
   transform_changed = data.transform_changed();
   post_local_scale_factor = data.post_local_scale_factor();
 
-  scroll_offset = ProtoToScrollOffset(data.scroll_offset());
+  scroll_offset_with_overscroll = ProtoToScrollOffset(data.scroll_offset());
   snap_amount = ProtoToVector2dF(data.snap_amount());
   source_offset = ProtoToVector2dF(data.source_offset());
   source_to_parent = ProtoToVector2dF(data.source_to_parent());
@@ -228,7 +229,8 @@ void TransformNode::AsValueInto(base::trace_event::TracedValue* value) const {
   value->SetInteger("content_target_id", 0);
   value->SetInteger("source_node_id", source_node_id);
   value->SetInteger("sorting_context_id", sorting_context_id);
-  MathUtil::AddToTracedValue("scroll_offset", scroll_offset, value);
+  MathUtil::AddToTracedValue("scroll_offset_with_overscroll",
+                             scroll_offset_with_overscroll, value);
   MathUtil::AddToTracedValue("snap_amount", snap_amount, value);
 }