| Index: Source/platform/scroll/ScrollableArea.cpp
|
| diff --git a/Source/platform/scroll/ScrollableArea.cpp b/Source/platform/scroll/ScrollableArea.cpp
|
| index a2451c83cb8572429aa21f1fbde4d39981d23277..c2be447d7866ccdfa7958e8267401010f25c37ca 100644
|
| --- a/Source/platform/scroll/ScrollableArea.cpp
|
| +++ b/Source/platform/scroll/ScrollableArea.cpp
|
| @@ -163,7 +163,7 @@ void ScrollableArea::setScrollPosition(const DoublePoint& position, ScrollType s
|
| behavior = scrollBehaviorStyle();
|
|
|
| if (scrollType == CompositorScroll)
|
| - scrollPositionChanged(adjustScrollPositionWithinRange(position), CompositorScroll);
|
| + scrollPositionChanged(clampScrollPosition(position), CompositorScroll);
|
| else if (scrollType == ProgrammaticScroll)
|
| programmaticScrollHelper(position, behavior);
|
| else if (scrollType == UserScroll)
|
| @@ -306,20 +306,6 @@ ScrollResult ScrollableArea::handleWheel(const PlatformWheelEvent& wheelEvent)
|
| return scrollAnimator()->handleWheelEvent(wheelEvent);
|
| }
|
|
|
| -IntPoint ScrollableArea::adjustScrollPositionWithinRange(const IntPoint& scrollPoint) const
|
| -{
|
| - IntPoint newScrollPosition = scrollPoint.shrunkTo(maximumScrollPosition());
|
| - newScrollPosition = newScrollPosition.expandedTo(minimumScrollPosition());
|
| - return newScrollPosition;
|
| -}
|
| -
|
| -DoublePoint ScrollableArea::adjustScrollPositionWithinRange(const DoublePoint& scrollPoint) const
|
| -{
|
| - DoublePoint newScrollPosition = scrollPoint.shrunkTo(maximumScrollPositionDouble());
|
| - newScrollPosition = newScrollPosition.expandedTo(minimumScrollPositionDouble());
|
| - return newScrollPosition;
|
| -}
|
| -
|
| // NOTE: Only called from Internals for testing.
|
| void ScrollableArea::setScrollOffsetFromInternals(const IntPoint& offset)
|
| {
|
|
|