Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2780)

Unified Diff: Source/platform/scroll/ScrollableArea.cpp

Issue 1056983004: OverscrollGlow for mainThread-{BLINK CHANGES} (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: addressed review comments Created 5 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/platform/scroll/ScrollableArea.cpp
diff --git a/Source/platform/scroll/ScrollableArea.cpp b/Source/platform/scroll/ScrollableArea.cpp
index 8e40b4e98219510e2e222512a6567168f4f8052a..5bf012c762f842ad5d366ced373071a20c84a538 100644
--- a/Source/platform/scroll/ScrollableArea.cpp
+++ b/Source/platform/scroll/ScrollableArea.cpp
@@ -122,7 +122,7 @@ GraphicsLayer* ScrollableArea::layerForContainer() const
return layerForScrolling() ? layerForScrolling()->parent() : 0;
}
-bool ScrollableArea::scroll(ScrollDirectionPhysical direction, ScrollGranularity granularity, float delta)
+ScrollResultOneDimensional ScrollableArea::scroll(ScrollDirectionPhysical direction, ScrollGranularity granularity, float delta)
{
ScrollbarOrientation orientation;
if (direction == ScrollUp || direction == ScrollDown)
@@ -131,7 +131,7 @@ bool ScrollableArea::scroll(ScrollDirectionPhysical direction, ScrollGranularity
orientation = HorizontalScrollbar;
if (!userInputScrollable(orientation))
- return false;
+ return ScrollResultOneDimensional(false, delta);
cancelProgrammaticScrollAnimation();
@@ -155,7 +155,7 @@ bool ScrollableArea::scroll(ScrollDirectionPhysical direction, ScrollGranularity
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)
@@ -275,7 +275,7 @@ ScrollResult ScrollableArea::handleWheel(const PlatformWheelEvent& wheelEvent)
{
// Wheel events which do not scroll are used to trigger zooming.
if (!wheelEvent.canScroll())
- return ScrollResult(false);
+ return ScrollResult();
cancelProgrammaticScrollAnimation();
return scrollAnimator()->handleWheelEvent(wheelEvent);

Powered by Google App Engine
This is Rietveld 408576698