Adding momentum/overscroll to views:: ScrollViews

cc/layers/layer_unittest.cc

 // Copyright 2011 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 "cc/layers/layer.h"
 
 #include <stddef.h>
 
 #include "base/threading/thread_task_runner_handle.h"
 #include "cc/animation/animation_host.h"
@@ skipping 192 matching lines @@
               dest->inputs_.sorting_context_id);
     EXPECT_EQ(src->num_descendants_that_draw_content_,
               dest->num_descendants_that_draw_content_);
     EXPECT_EQ(src->inputs_.scroll_clip_layer_id,
               dest->inputs_.scroll_clip_layer_id);
     EXPECT_EQ(src->inputs_.user_scrollable_horizontal,
               dest->inputs_.user_scrollable_horizontal);
     EXPECT_EQ(src->inputs_.user_scrollable_vertical,
               dest->inputs_.user_scrollable_vertical);
     EXPECT_EQ(src->inputs_.scroll_offset, dest->inputs_.scroll_offset);
+    EXPECT_EQ(src->inputs_.overscroll, dest->inputs_.overscroll);
     EXPECT_EQ(update_rect, dest->inputs_.update_rect);
 
     if (src->inputs_.scroll_parent) {
       ASSERT_TRUE(dest->inputs_.scroll_parent);
       EXPECT_EQ(src->inputs_.scroll_parent->id(),
                 dest->inputs_.scroll_parent->id());
     } else {
       EXPECT_FALSE(dest->inputs_.scroll_parent);
     }
     if (src->scroll_children_) {
@@ skipping 85 matching lines @@
     layer->inputs_.use_parent_backface_visibility = true;
     gfx::Transform transform;
     transform.Rotate(90);
     layer->inputs_.transform = transform;
     layer->inputs_.sorting_context_id = 0;
     layer->num_descendants_that_draw_content_ = 5;
     layer->inputs_.scroll_clip_layer_id = Layer::INVALID_ID;
     layer->inputs_.user_scrollable_horizontal = false;
     layer->inputs_.user_scrollable_vertical = true;
     layer->inputs_.scroll_offset = gfx::ScrollOffset(3, 14);
+    layer->inputs_.overscroll = gfx::ScrollOffset(-10, -5);
     layer->inputs_.update_rect = gfx::Rect(14, 15);
 
     VerifyBaseLayerPropertiesSerializationAndDeserialization(layer.get());
   }
 
   void RunAllMembersChangedTest() {
     scoped_refptr<Layer> layer = Layer::Create();
     layer->inputs_.transform_origin = gfx::Point3F(3.0f, 1.0f, 4.0f);
     layer->inputs_.background_color = SK_ColorRED;
     layer->inputs_.bounds = gfx::Size(3, 14);
@@ skipping 32 matching lines @@
     transform.Rotate(90);
     layer->inputs_.transform = transform;
     layer->inputs_.sorting_context_id = 42;
     layer->num_descendants_that_draw_content_ = 5;
     layer->inputs_.scroll_clip_layer_id = 17;
     layer->inputs_.user_scrollable_horizontal =
         !layer->inputs_.user_scrollable_horizontal;
     layer->inputs_.user_scrollable_vertical =
         !layer->inputs_.user_scrollable_vertical;
     layer->inputs_.scroll_offset = gfx::ScrollOffset(3, 14);
+    layer->inputs_.overscroll = gfx::ScrollOffset(-10, -5);
     layer->inputs_.update_rect = gfx::Rect(14, 15);
 
     VerifyBaseLayerPropertiesSerializationAndDeserialization(layer.get());
   }
 
   void VerifySolidColorScrollbarLayerAfterSerializationAndDeserialization(
       scoped_refptr<SolidColorScrollbarLayer> source_scrollbar) {
     proto::LayerProperties serialized_scrollbar;
     source_scrollbar->LayerSpecificPropertiesToProto(&serialized_scrollbar);
 
@@ skipping 2151 matching lines @@
   EXPECT_EQ(MutableProperty::kNone, impl_layer->mutable_properties());
 
   test_layer->PushPropertiesTo(impl_layer.get());
 
   EXPECT_EQ(ElementId(2, 0), impl_layer->element_id());
   EXPECT_EQ(MutableProperty::kTransform, impl_layer->mutable_properties());
 }
 
 }  // namespace
 }  // namespace cc