| Index: third_party/WebKit/Source/platform/scroll/ScrollAnimator.h
|
| diff --git a/third_party/WebKit/Source/platform/scroll/ScrollAnimator.h b/third_party/WebKit/Source/platform/scroll/ScrollAnimator.h
|
| index b225833840227f80146118337f09489e03af2944..c5717d15d332f53fbb5f83e0cb21efb1529074fb 100644
|
| --- a/third_party/WebKit/Source/platform/scroll/ScrollAnimator.h
|
| +++ b/third_party/WebKit/Source/platform/scroll/ScrollAnimator.h
|
| @@ -48,7 +48,7 @@ public:
|
| explicit ScrollAnimator(ScrollableArea*, WTF::TimeFunction = WTF::monotonicallyIncreasingTime);
|
| ~ScrollAnimator() override;
|
|
|
| - bool hasRunningAnimation() const;
|
| + bool hasRunningAnimation() const override;
|
| float computeDeltaToConsume(ScrollbarOrientation, float pixelDelta) const override;
|
|
|
| ScrollResultOneDimensional userScroll(ScrollbarOrientation, ScrollGranularity, float step, float delta) override;
|
| @@ -77,6 +77,9 @@ private:
|
| // immediately to the target and returns false.
|
| bool registerAndScheduleAnimation();
|
|
|
| + void addMainThreadScrollingReason();
|
| + void removeMainThreadScrollingReason();
|
| +
|
| FloatPoint m_targetOffset;
|
| ScrollGranularity m_lastGranularity;
|
| };
|
|
|