| Index: Source/platform/mac/ScrollAnimatorMac.mm
|
| diff --git a/Source/platform/mac/ScrollAnimatorMac.mm b/Source/platform/mac/ScrollAnimatorMac.mm
|
| index 8e4577287c9281addc5e034d9e6a201faaf0d465..5fe1559a21138ce6160c38a717a980e205d58b6b 100644
|
| --- a/Source/platform/mac/ScrollAnimatorMac.mm
|
| +++ b/Source/platform/mac/ScrollAnimatorMac.mm
|
| @@ -726,10 +726,10 @@ ScrollResultOneDimensional ScrollAnimatorMac::userScroll(ScrollbarOrientation or
|
| return ScrollResultOneDimensional(true, delta - usedDelta);
|
| }
|
|
|
| -void ScrollAnimatorMac::scrollToOffsetWithoutAnimation(const FloatPoint& offset)
|
| +void ScrollAnimatorMac::scrollToOffsetWithoutAnimation(const FloatPoint& offset, ScrollType scrollType)
|
| {
|
| [m_scrollAnimationHelper.get() _stopRun];
|
| - immediateScrollTo(offset);
|
| + immediateScrollTo(offset, scrollType);
|
| }
|
|
|
| FloatPoint ScrollAnimatorMac::adjustScrollPositionIfNecessary(const FloatPoint& position) const
|
| @@ -746,7 +746,7 @@ FloatPoint ScrollAnimatorMac::adjustScrollPositionIfNecessary(const FloatPoint&
|
| return FloatPoint(newX, newY);
|
| }
|
|
|
| -void ScrollAnimatorMac::immediateScrollTo(const FloatPoint& newPosition)
|
| +void ScrollAnimatorMac::immediateScrollTo(const FloatPoint& newPosition, ScrollType scrollType)
|
| {
|
| FloatPoint adjustedPosition = adjustScrollPositionIfNecessary(newPosition);
|
|
|
| @@ -759,7 +759,7 @@ void ScrollAnimatorMac::immediateScrollTo(const FloatPoint& newPosition)
|
| m_currentPosX = adjustedPosition.x();
|
| m_currentPosY = adjustedPosition.y();
|
| notifyContentAreaScrolled(delta);
|
| - notifyPositionChanged();
|
| + notifyPositionChanged(scrollType);
|
| }
|
|
|
| void ScrollAnimatorMac::contentAreaWillPaint() const
|
|
|