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

Unified Diff: Source/core/layout/LayoutBox.cpp

Issue 1056983004: OverscrollGlow for mainThread-{BLINK CHANGES} (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Tests !!! 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/core/layout/LayoutBox.cpp
diff --git a/Source/core/layout/LayoutBox.cpp b/Source/core/layout/LayoutBox.cpp
index 3e77013a1c7f5084e26fec352ff37c6c4b811b68..f95345437b2e1a872e59b629dbaff0e4767926d0 100644
--- a/Source/core/layout/LayoutBox.cpp
+++ b/Source/core/layout/LayoutBox.cpp
@@ -735,7 +735,7 @@ int LayoutBox::intrinsicScrollbarLogicalWidth() const
return 0;
}
-bool LayoutBox::scroll(ScrollDirection direction, ScrollGranularity granularity, float delta)
+ScrollResultOneDimensional LayoutBox::scroll(ScrollDirection direction, ScrollGranularity granularity, float delta)
{
// Presumably the same issue as in setScrollTop. See crbug.com/343132.
DisableCompositingQueryAsserts disabler;
@@ -744,7 +744,7 @@ bool LayoutBox::scroll(ScrollDirection direction, ScrollGranularity granularity,
ASSERT(!isLogical(direction));
if (!layer() || !layer()->scrollableArea())
- return false;
+ return ScrollResultOneDimensional(false, delta);
return layer()->scrollableArea()->scroll(direction, granularity, delta);
}

Powered by Google App Engine
This is Rietveld 408576698