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

Unified Diff: Source/core/page/EventHandler.cpp

Issue 1113973002: Remove FrameView::m_inProgrammaticScroll and related plumbing. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 5 years, 8 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/loader/FrameLoader.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/core/page/EventHandler.cpp
diff --git a/Source/core/page/EventHandler.cpp b/Source/core/page/EventHandler.cpp
index dd3c5aee907340e0eb1b561e52fb6f57dfe5547c..f84ff3f8b7a2ef45b1af341ffc054ba0566f1fa4 100644
--- a/Source/core/page/EventHandler.cpp
+++ b/Source/core/page/EventHandler.cpp
@@ -987,8 +987,10 @@ bool EventHandler::bubblingScroll(ScrollDirection direction, ScrollGranularity g
return true;
LocalFrame* frame = m_frame;
FrameView* view = frame->view();
- if (view && view->scroll(direction, granularity))
+ if (view && view->scroll(direction, granularity)) {
+ setFrameWasScrolledByUser();
return true;
+ }
Frame* parentFrame = frame->tree().parent();
if (!parentFrame || !parentFrame->isLocalFrame())
return false;
« no previous file with comments | « Source/core/loader/FrameLoader.cpp ('k') | Source/web/WebViewImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698