| Index: third_party/WebKit/Source/core/frame/LocalFrame.cpp
|
| diff --git a/third_party/WebKit/Source/core/frame/LocalFrame.cpp b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
|
| index af21f1c79c620aeba8c189a3efd8fd96de544006..75f6af33171343cee7d821e2de66a95262f81b18 100644
|
| --- a/third_party/WebKit/Source/core/frame/LocalFrame.cpp
|
| +++ b/third_party/WebKit/Source/core/frame/LocalFrame.cpp
|
| @@ -776,15 +776,15 @@ void LocalFrame::removeSpellingMarkersUnderWords(const Vector<String>& words)
|
| spellChecker().removeSpellingMarkersUnderWords(words);
|
| }
|
|
|
| -static ScrollResult scrollAreaOnBothAxes(const FloatSize& delta, ScrollableArea& view)
|
| +static ScrollResult scrollAreaOnBothAxes(ScrollGranularity granularity, const FloatSize& delta, ScrollableArea& view)
|
| {
|
| - ScrollResultOneDimensional scrolledHorizontal = view.userScroll(ScrollLeft, ScrollByPrecisePixel, delta.width());
|
| - ScrollResultOneDimensional scrolledVertical = view.userScroll(ScrollUp, ScrollByPrecisePixel, delta.height());
|
| + ScrollResultOneDimensional scrolledHorizontal = view.userScroll(ScrollLeft, granularity, delta.width());
|
| + ScrollResultOneDimensional scrolledVertical = view.userScroll(ScrollUp, granularity, delta.height());
|
| return ScrollResult(scrolledHorizontal.didScroll, scrolledVertical.didScroll, scrolledHorizontal.unusedScrollDelta, scrolledVertical.unusedScrollDelta);
|
| }
|
|
|
| // Returns true if a scroll occurred.
|
| -ScrollResult LocalFrame::applyScrollDelta(const FloatSize& delta, bool isScrollBegin)
|
| +ScrollResult LocalFrame::applyScrollDelta(ScrollGranularity granularity, const FloatSize& delta, bool isScrollBegin)
|
| {
|
| if (isScrollBegin)
|
| host()->topControls().scrollBegin();
|
| @@ -801,7 +801,7 @@ ScrollResult LocalFrame::applyScrollDelta(const FloatSize& delta, bool isScrollB
|
| if (remainingDelta.isZero())
|
| return ScrollResult(delta.width(), delta.height(), 0.0f, 0.0f);
|
|
|
| - ScrollResult result = scrollAreaOnBothAxes(remainingDelta, *view()->scrollableArea());
|
| + ScrollResult result = scrollAreaOnBothAxes(granularity, remainingDelta, *view()->scrollableArea());
|
| result.didScrollX = result.didScrollX || (remainingDelta.width() != delta.width());
|
| result.didScrollY = result.didScrollY || (remainingDelta.height() != delta.height());
|
|
|
|
|