| Index: Source/platform/scroll/ScrollableArea.cpp
|
| diff --git a/Source/platform/scroll/ScrollableArea.cpp b/Source/platform/scroll/ScrollableArea.cpp
|
| index b77c1f997d93ceaa6d0d9fa297de0c758a7c1c48..3525b714c95eb7974b62f4aad1eec37b53994f6c 100644
|
| --- a/Source/platform/scroll/ScrollableArea.cpp
|
| +++ b/Source/platform/scroll/ScrollableArea.cpp
|
| @@ -120,7 +120,7 @@ GraphicsLayer* ScrollableArea::layerForContainer() const
|
| return layerForScrolling() ? layerForScrolling()->parent() : 0;
|
| }
|
|
|
| -bool ScrollableArea::scroll(ScrollDirection direction, ScrollGranularity granularity, float delta)
|
| +ScrollResultOneDimensional ScrollableArea::scroll(ScrollDirection direction, ScrollGranularity granularity, float delta)
|
| {
|
| ScrollbarOrientation orientation;
|
|
|
| @@ -130,7 +130,7 @@ bool ScrollableArea::scroll(ScrollDirection direction, ScrollGranularity granula
|
| orientation = HorizontalScrollbar;
|
|
|
| if (!userInputScrollable(orientation))
|
| - return false;
|
| + return ScrollResultOneDimensional(false, delta);
|
|
|
| cancelProgrammaticScrollAnimation();
|
|
|
| @@ -154,7 +154,7 @@ bool ScrollableArea::scroll(ScrollDirection direction, ScrollGranularity granula
|
| if (direction == ScrollUp || direction == ScrollLeft)
|
| delta = -delta;
|
|
|
| - return scrollAnimator()->scroll(orientation, granularity, step, delta).didScroll;
|
| + return scrollAnimator()->scroll(orientation, granularity, step, delta);
|
| }
|
|
|
| void ScrollableArea::setScrollPosition(const DoublePoint& position, ScrollBehavior behavior)
|
|
|