[not for review - epic CL] Adding Elastic+Momentum+Layered scrolling to 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 0060c3a06e05e5b66bdedc4d25df13360caea597..407d0abf165acd1643ba4021ea898967630a54a7 100644
--- a/cc/trees/transform_node.cc
+++ b/cc/trees/transform_node.cc
@@ -78,7 +78,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;
@@ -156,7 +156,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());
@@ -214,7 +215,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());
@@ -232,7 +233,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("scroll_snap", scroll_snap, value);
 }