| Index: third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm
|
| diff --git a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm
|
| index 0a52e4f0a41ef2577f468dc6d1b8fbe304fc13a4..fa1161ce4499b34ba90d1509d2fb4472accbd9b4 100644
|
| --- a/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm
|
| +++ b/third_party/WebKit/Source/platform/mac/ScrollAnimatorMac.mm
|
| @@ -871,25 +871,6 @@ void ScrollAnimatorMac::contentAreaDidHide() const {
|
| [m_scrollbarPainterController.get() windowOrderedOut];
|
| }
|
|
|
| -void ScrollAnimatorMac::didBeginScrollGesture() const {
|
| - if (!getScrollableArea()->scrollbarsCanBeActive())
|
| - return;
|
| - [m_scrollbarPainterController.get() beginScrollGesture];
|
| -}
|
| -
|
| -void ScrollAnimatorMac::didEndScrollGesture() const {
|
| - if (!getScrollableArea()->scrollbarsCanBeActive())
|
| - return;
|
| - [m_scrollbarPainterController.get() endScrollGesture];
|
| -}
|
| -
|
| -void ScrollAnimatorMac::mayBeginScrollGesture() const {
|
| - if (!getScrollableArea()->scrollbarsCanBeActive())
|
| - return;
|
| - [m_scrollbarPainterController.get() beginScrollGesture];
|
| - [m_scrollbarPainterController.get() contentAreaScrolled];
|
| -}
|
| -
|
| void ScrollAnimatorMac::finishCurrentScrollAnimations() {
|
| [m_scrollbarPainterController.get() hideOverlayScrollers];
|
| }
|
| @@ -972,21 +953,6 @@ void ScrollAnimatorMac::cancelAnimation() {
|
| m_haveScrolledSincePageLoad = false;
|
| }
|
|
|
| -void ScrollAnimatorMac::handleWheelEventPhase(PlatformWheelEventPhase phase) {
|
| - // This may not have been set to true yet if the wheel event was handled by
|
| - // the ScrollingTree,
|
| - // So set it to true here.
|
| - m_haveScrolledSincePageLoad = true;
|
| -
|
| - if (phase == PlatformWheelEventPhaseBegan)
|
| - didBeginScrollGesture();
|
| - else if (phase == PlatformWheelEventPhaseEnded ||
|
| - phase == PlatformWheelEventPhaseCancelled)
|
| - didEndScrollGesture();
|
| - else if (phase == PlatformWheelEventPhaseMayBegin)
|
| - mayBeginScrollGesture();
|
| -}
|
| -
|
| void ScrollAnimatorMac::updateScrollerStyle() {
|
| if (!getScrollableArea()->scrollbarsCanBeActive()) {
|
| m_needsScrollerStyleUpdate = true;
|
|
|