Overscroll and Elasticity for views::ScrollView

cc/trees/transform_node.cc

 // Copyright 2016 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 "base/trace_event/trace_event_argument.h"
 #include "cc/base/math_util.h"
 #include "cc/proto/gfx_conversions.h"
 #include "cc/proto/property_tree.pb.h"
 #include "cc/trees/transform_node.h"
 #include "ui/gfx/geometry/point3_f.h"
@@ skipping 59 matching lines @@
          affected_by_inner_viewport_bounds_delta_y ==
              other.affected_by_inner_viewport_bounds_delta_y &&
          affected_by_outer_viewport_bounds_delta_x ==
              other.affected_by_outer_viewport_bounds_delta_x &&
          affected_by_outer_viewport_bounds_delta_y ==
              other.affected_by_outer_viewport_bounds_delta_y &&
          in_subtree_of_page_scale_layer ==
              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;
 }
 
 void TransformNode::update_pre_local_transform(
     const gfx::Point3F& transform_origin) {
   pre_local.MakeIdentity();
   pre_local.Translate3d(-transform_origin.x(), -transform_origin.y(),
                         -transform_origin.z());
@@ skipping 55 matching lines @@
       affected_by_inner_viewport_bounds_delta_y);
   data->set_affected_by_outer_viewport_bounds_delta_x(
       affected_by_outer_viewport_bounds_delta_x);
   data->set_affected_by_outer_viewport_bounds_delta_y(
       affected_by_outer_viewport_bounds_delta_y);
 
   data->set_in_subtree_of_page_scale_layer(in_subtree_of_page_scale_layer);
   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());
 }
 
 void TransformNode::FromProtobuf(const proto::TreeNode& proto) {
   id = proto.id();
   parent_id = proto.parent_id();
   owner_id = proto.owner_id();
 
@@ skipping 36 matching lines @@
       data.affected_by_inner_viewport_bounds_delta_y();
   affected_by_outer_viewport_bounds_delta_x =
       data.affected_by_outer_viewport_bounds_delta_x();
   affected_by_outer_viewport_bounds_delta_y =
       data.affected_by_outer_viewport_bounds_delta_y();
 
   in_subtree_of_page_scale_layer = data.in_subtree_of_page_scale_layer();
   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());
 }
 
 void TransformNode::AsValueInto(base::trace_event::TracedValue* value) const {
   value->SetInteger("id", id);
   value->SetInteger("parent_id", parent_id);
   value->SetInteger("owner_id", owner_id);
   MathUtil::AddToTracedValue("pre_local", pre_local, value);
   MathUtil::AddToTracedValue("local", local, value);
   MathUtil::AddToTracedValue("post_local", post_local, value);
   // TODO(sunxd): make frameviewer work without target_id
   value->SetInteger("target_id", 0);
   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);
 }
 
 TransformCachedNodeData::TransformCachedNodeData()
     : target_id(-1), content_target_id(-1) {}
 
 TransformCachedNodeData::TransformCachedNodeData(
     const TransformCachedNodeData& other) = default;
 
 TransformCachedNodeData::~TransformCachedNodeData() {}
@@ skipping 15 matching lines @@
 
 void TransformCachedNodeData::FromProtobuf(
     const proto::TransformCachedNodeData& proto) {
   from_screen = ProtoToTransform(proto.from_screen());
   to_screen = ProtoToTransform(proto.to_screen());
   target_id = proto.target_id();
   content_target_id = proto.content_target_id();
 }
 
 }  // namespace cc