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

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: added function for comparison 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 55dd4ae3522c2c79e10c19de48ef3112a0a4761d..8f7288730fe29d2bd59556db4f26cfb332857c9f 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(ScrollDirection direction, ScrollGranularity granularity, float delta)
+ScrollResultOneDimensional ScrollableArea::scroll(ScrollDirection direction, ScrollGranularity granularity, float delta)
{
ASSERT(!isLogical(direction));
@@ -133,7 +133,7 @@ bool ScrollableArea::scroll(ScrollDirection direction, ScrollGranularity granula
orientation = HorizontalScrollbar;
if (!userInputScrollable(orientation))
- return false;
+ return ScrollResultOneDimensional(false, delta);
cancelProgrammaticScrollAnimation();
@@ -157,7 +157,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)

Powered by Google App Engine
This is Rietveld 408576698