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

Unified Diff: Source/core/dom/Element.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 | « no previous file | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/dom/Element.cpp
diff --git a/Source/core/dom/Element.cpp b/Source/core/dom/Element.cpp
index 8a3c55dc5d609d6304bf5fcb54fc2baa967b7c1f..275088dea89298212dbbde25a3d0b34d7e14907a 100644
--- a/Source/core/dom/Element.cpp
+++ b/Source/core/dom/Element.cpp
@@ -516,7 +516,7 @@ void Element::applyScroll(ScrollState& scrollState)
// Handle the documentElement separately, as it scrolls the FrameView.
if (this == document().documentElement()) {
FloatSize delta(deltaX, deltaY);
- if (document().frame()->applyScrollDelta(delta, scrollState.isBeginning())) {
+ if (document().frame()->applyScrollDelta(delta, scrollState.isBeginning()).didScroll()) {
scrolled = true;
scrollState.consumeDeltaNative(scrollState.deltaX(), scrollState.deltaY());
}
@@ -526,12 +526,12 @@ void Element::applyScroll(ScrollState& scrollState)
LayoutBox* curBox = layoutObject()->enclosingBox();
// FIXME: Native scrollers should only consume the scroll they
// apply. See crbug.com/457765.
- if (deltaX && curBox->scroll(ScrollLeft, ScrollByPrecisePixel, deltaX)) {
+ if (deltaX && curBox->scroll(ScrollLeft, ScrollByPrecisePixel, deltaX).didScroll) {
scrollState.consumeDeltaNative(scrollState.deltaX(), 0);
scrolled = true;
}
- if (deltaY && curBox->scroll(ScrollUp, ScrollByPrecisePixel, deltaY)) {
+ if (deltaY && curBox->scroll(ScrollUp, ScrollByPrecisePixel, deltaY).didScroll) {
scrollState.consumeDeltaNative(0, scrollState.deltaY());
scrolled = true;
}
« no previous file with comments | « no previous file | Source/core/frame/FrameView.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698