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

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 2924953002: Ignore the rest of the scroll sequence if GSB is ignored. (Closed)
Patch Set: merged with master, redundant 'assert' deleted from function names. Created 3 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 | content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/layer_tree_host_impl.cc
diff --git a/cc/trees/layer_tree_host_impl.cc b/cc/trees/layer_tree_host_impl.cc
index 435cc8d21fe0f21e9e70a8feedda979c708e8aa8..2209c4181aea306ef4dd53354c17075dc8898d09 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -2773,6 +2773,8 @@ InputHandler::ScrollStatus LayerTreeHostImpl::ScrollBeginImpl(
MainThreadScrollingReason::kNotScrollingOnMain;
if (!scrolling_node) {
scroll_status.thread = SCROLL_IGNORED;
+ if (settings_.is_layer_tree_for_subframe)
+ scroll_status.thread = SCROLL_UNKNOWN;
scroll_status.main_thread_scrolling_reasons =
MainThreadScrollingReason::kNoScrollingLayer;
return scroll_status;
« no previous file with comments | « no previous file | content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698