Update from https://crrev.com/309717

cc/input/scroll_elasticity_helper.h

 // Copyright 2014 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.
 
 #ifndef CC_INPUT_SCROLL_ELASTICITY_HELPER_H_
 #define CC_INPUT_SCROLL_ELASTICITY_HELPER_H_
 
 #include "base/time/time.h"
 #include "cc/base/cc_export.h"
+#include "ui/gfx/geometry/scroll_offset.h"
 #include "ui/gfx/geometry/vector2d_f.h"
 
 namespace cc {
 
 class LayerTreeHostImpl;
 
 // ScrollElasticityHelper is based on
 // WebKit/Source/platform/mac/ScrollElasticityController.h
 /*
  * Copyright (C) 2011 Apple Inc. All rights reserved.
@@ skipping 25 matching lines @@
 // interface itself. This artificial boundary is introduced to reduce the amount
 // of logic and state held directly inside LayerTreeHostImpl.
 class CC_EXPORT ScrollElasticityHelper {
  public:
   static ScrollElasticityHelper* CreateForLayerTreeHostImpl(
       LayerTreeHostImpl* layer_tree_host_impl);
 
   virtual ~ScrollElasticityHelper() {}
 
   // The amount that the view is stretched past the normal allowable bounds.
-  virtual gfx::Vector2dF StretchAmount() = 0;
+  virtual gfx::Vector2dF StretchAmount() const = 0;
   virtual void SetStretchAmount(const gfx::Vector2dF& stretch_amount) = 0;
-  // Returns true if either component of |direction| is pointing in a direction
-  // in which it is not possible to scroll any farther. It is only in this
-  // circumstance that an overscroll in that direction may begin.
-  // TODO(ccameron): Note that it is possible for a scroll to occur against a
-  // previous over-scroll. Such a scroll needs to first cancel out the
-  // over-scroll, and only then may it start scrolling away from the edge.
-  virtual bool PinnedInDirection(const gfx::Vector2dF& direction) = 0;
-  // Whether or not the content of the page is scrollable in each direction.
-  virtual bool CanScrollHorizontally() = 0;
-  virtual bool CanScrollVertically() = 0;
+
+  // Functions for the scrolling of the root scroll layer.
+  virtual gfx::ScrollOffset ScrollOffset() const = 0;
+  virtual gfx::ScrollOffset MaxScrollOffset() const = 0;
+  virtual void ScrollBy(const gfx::Vector2dF& delta) = 0;
+
   // Request that the controller have its Animate method called for the next
   // frame.
   virtual void RequestAnimate() = 0;
 };
 
 }  // namespace cc
 
 #endif  // CC_INPUT_SCROLL_ELASTICITY_HELPER_H_