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

Unified Diff: Source/core/frame/LocalFrame.cpp

Issue 1056983004: OverscrollGlow for mainThread-{BLINK CHANGES} (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebased to latest Created 5 years, 6 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
« no previous file with comments | « Source/core/frame/LocalFrame.h ('k') | Source/core/frame/RootFrameViewport.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/frame/LocalFrame.cpp
diff --git a/Source/core/frame/LocalFrame.cpp b/Source/core/frame/LocalFrame.cpp
index c9bc9a1c3cdfcfd9852ee8818b7d02e6183bf47b..0b132b587fb7a94d0bbf164ee6b1f0047403577f 100644
--- a/Source/core/frame/LocalFrame.cpp
+++ b/Source/core/frame/LocalFrame.cpp
@@ -718,21 +718,21 @@ void LocalFrame::removeSpellingMarkersUnderWords(const Vector<String>& words)
spellChecker().removeSpellingMarkersUnderWords(words);
}
-static bool scrollAreaOnBothAxes(const FloatSize& delta, ScrollableArea& view)
+static ScrollResult scrollAreaOnBothAxes(const FloatSize& delta, ScrollableArea& view)
{
- bool scrolledHorizontal = view.userScroll(ScrollLeft, ScrollByPrecisePixel, delta.width());
- bool scrolledVertical = view.userScroll(ScrollUp, ScrollByPrecisePixel, delta.height());
- return scrolledHorizontal || scrolledVertical;
+ ScrollResultOneDimensional scrolledHorizontal = view.userScroll(ScrollLeft, ScrollByPrecisePixel, delta.width());
+ ScrollResultOneDimensional scrolledVertical = view.userScroll(ScrollUp, ScrollByPrecisePixel, delta.height());
+ return ScrollResult(scrolledHorizontal.didScroll, scrolledVertical.didScroll, scrolledHorizontal.unusedScrollDelta, scrolledVertical.unusedScrollDelta);
}
// Returns true if a scroll occurred.
-bool LocalFrame::applyScrollDelta(const FloatSize& delta, bool isScrollBegin)
+ScrollResult LocalFrame::applyScrollDelta(const FloatSize& delta, bool isScrollBegin)
{
if (isScrollBegin)
host()->topControls().scrollBegin();
if (!view() || delta.isZero())
- return false;
+ return ScrollResult(false, false, delta.width(), delta.height());
FloatSize remainingDelta = delta;
@@ -741,14 +741,13 @@ bool LocalFrame::applyScrollDelta(const FloatSize& delta, bool isScrollBegin)
remainingDelta = host()->topControls().scrollBy(remainingDelta);
if (remainingDelta.isZero())
- return true;
-
- bool consumed = remainingDelta != delta;
+ return ScrollResult(delta.width(), delta.height(), 0.0f, 0.0f);
- if (scrollAreaOnBothAxes(remainingDelta, *view()->scrollableArea()))
- return true;
+ ScrollResult result = scrollAreaOnBothAxes(remainingDelta, *view()->scrollableArea());
+ result.didScrollX = result.didScrollX || (remainingDelta.width() != delta.width());
+ result.didScrollY = result.didScrollY || (remainingDelta.height() != delta.height());
- return consumed;
+ return result;
}
bool LocalFrame::shouldScrollTopControls(const FloatSize& delta) const
« no previous file with comments | « Source/core/frame/LocalFrame.h ('k') | Source/core/frame/RootFrameViewport.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698