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

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 2785533003: Animated scroll shouldn't consume unhandled scrolls for OOPIFs. (Closed)
Patch Set: Address nits, add comments. Created 3 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 | « cc/trees/layer_tree_host_client.h ('k') | cc/trees/layer_tree_settings.h » ('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 ca08b6f24da33a3b3a56811fee6ffd2e2cf9bc5a..67483420502ad7c9b19fab1b834352690fb269a3 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -3035,6 +3035,14 @@ InputHandler::ScrollStatus LayerTreeHostImpl::ScrollAnimated(
}
scroll_state.set_is_ending(true);
ScrollEnd(&scroll_state);
+ if (settings_.is_layer_tree_for_subframe &&
+ scroll_status.thread == SCROLL_ON_IMPL_THREAD) {
+ // If we get to here, we shouldn't return SCROLL_ON_IMPL_THREAD as otherwise
+ // we'll mark the scroll as handled and the scroll won't bubble.
+ scroll_status.thread = SCROLL_IGNORED;
+ scroll_status.main_thread_scrolling_reasons =
+ MainThreadScrollingReason::kNotScrollable;
+ }
return scroll_status;
}
« no previous file with comments | « cc/trees/layer_tree_host_client.h ('k') | cc/trees/layer_tree_settings.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698