| Index: Source/platform/mac/ScrollAnimatorMac.h
|
| diff --git a/Source/platform/mac/ScrollAnimatorMac.h b/Source/platform/mac/ScrollAnimatorMac.h
|
| index f5f791424c63725d1900620aee363eef52a58a51..1c5eb644a55f2e75d9464e0512ddb9dff98fd97e 100644
|
| --- a/Source/platform/mac/ScrollAnimatorMac.h
|
| +++ b/Source/platform/mac/ScrollAnimatorMac.h
|
| @@ -80,7 +80,7 @@ private:
|
| Timer<ScrollAnimatorMac> m_sendContentAreaScrolledTimer;
|
| FloatSize m_contentAreaScrolledTimerScrollDelta;
|
|
|
| - virtual ScrollResultOneDimensional scroll(ScrollbarOrientation, ScrollGranularity, float step, float delta) override;
|
| + virtual ScrollResultOneDimensional userScroll(ScrollbarOrientation, ScrollGranularity, float step, float delta) override;
|
| virtual void scrollToOffsetWithoutAnimation(const FloatPoint&) override;
|
|
|
| virtual void handleWheelEventPhase(PlatformWheelEventPhase) override;
|
|
|