| Index: ui/events/android/scroller.h
|
| diff --git a/ui/events/android/scroller.h b/ui/events/android/scroller.h
|
| index 37d41cd3e1bfa127dbe0c50234982bb1740e6485..b0acbd1486d805f09ab68415d63c6a0dee2f3eac 100644
|
| --- a/ui/events/android/scroller.h
|
| +++ b/ui/events/android/scroller.h
|
| @@ -35,6 +35,10 @@ class EVENTS_BASE_EXPORT Scroller : public GestureCurve {
|
| gfx::Vector2dF* offset,
|
| gfx::Vector2dF* velocity) override;
|
|
|
| + void ComputeTotalScrollOffset(gfx::Vector2dF& offset) override;
|
| +
|
| + bool ResetCurveBySnappedOffset(const gfx::Vector2dF& offset) override;
|
| +
|
| // Start scrolling by providing a starting point and the distance to travel.
|
| // The default value of 250 milliseconds will be used for the duration.
|
| void StartScroll(float start_x,
|
| @@ -111,6 +115,8 @@ class EVENTS_BASE_EXPORT Scroller : public GestureCurve {
|
| double GetSplineDeceleration(float velocity) const;
|
| base::TimeDelta GetSplineFlingDuration(float velocity) const;
|
| double GetSplineFlingDistance(float velocity) const;
|
| + double GetSplineVelocityFromDeceleration(float deceleration) const;
|
| + double GetSplineVelocityFromDistance(float distance) const;
|
|
|
| Mode mode_;
|
|
|
|
|