Chromium Code Reviews| Index: Source/platform/scroll/ScrollAnimator.cpp |
| diff --git a/Source/platform/scroll/ScrollAnimator.cpp b/Source/platform/scroll/ScrollAnimator.cpp |
| index 06299a25f26b09ef1aee4873017f413128e3a549..f8f4271022bda644c3b80433cb26c4add68e9d2e 100644 |
| --- a/Source/platform/scroll/ScrollAnimator.cpp |
| +++ b/Source/platform/scroll/ScrollAnimator.cpp |
| @@ -54,8 +54,9 @@ ScrollResultOneDimensional ScrollAnimator::scroll(ScrollbarOrientation orientati |
| { |
| float& currentPos = (orientation == HorizontalScrollbar) ? m_currentPosX : m_currentPosY; |
| float newPos = clampScrollPosition(orientation, currentPos + step * delta); |
| + |
|
majidvp
2015/06/03 17:36:41
nitp: extra blank line
MuVen
2015/06/04 11:19:59
Done.
|
| if (currentPos == newPos) |
| - return ScrollResultOneDimensional(false); |
| + return ScrollResultOneDimensional(false, delta); |
| float usedDelta = (newPos - currentPos) / step; |
| currentPos = newPos; |
| @@ -84,7 +85,7 @@ ScrollResult ScrollAnimator::handleWheelEvent(const PlatformWheelEvent& e) |
| float deltaX = canScrollX ? e.deltaX() : 0; |
| float deltaY = canScrollY ? e.deltaY() : 0; |
| - ScrollResult result(false); |
| + ScrollResult result; |
| #if !OS(MACOSX) |
| ScrollGranularity granularity = e.hasPreciseScrollingDeltas() ? ScrollByPrecisePixel : ScrollByPixel; |
| @@ -95,11 +96,12 @@ ScrollResult ScrollAnimator::handleWheelEvent(const PlatformWheelEvent& e) |
| IntSize maxForwardScrollDelta = m_scrollableArea->maximumScrollPosition() - m_scrollableArea->scrollPosition(); |
| IntSize maxBackwardScrollDelta = m_scrollableArea->scrollPosition() - m_scrollableArea->minimumScrollPosition(); |
| if ((deltaX < 0 && maxForwardScrollDelta.width() > 0) |
| - || (deltaX > 0 && maxBackwardScrollDelta.width() > 0) |
| - || (deltaY < 0 && maxForwardScrollDelta.height() > 0) |
| - || (deltaY > 0 && maxBackwardScrollDelta.height() > 0)) { |
| - result.didScroll = true; |
| - |
| + || (deltaX > 0 && maxBackwardScrollDelta.width() > 0)) |
| + result.didScrollX = true; |
| + if ((deltaY < 0 && maxForwardScrollDelta.height() > 0) |
| + || (deltaY > 0 && maxBackwardScrollDelta.height() > 0)) |
| + result.didScrollY = true; |
| + if (result.didScroll()) { |
| if (deltaY) { |
| if (e.granularity() == ScrollByPageWheelEvent) { |
| bool negative = deltaY < 0; |