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

Unified Diff: cc/trees/layer_tree_host_impl.cc

Issue 2144303002: Made layout viewport scroll updates from compositor work like ordinary layers. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@rootScrollerOnCompositor
Patch Set: Created 4 years, 5 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
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 dd3c6299aaa0ac3966389b1b49fc9ed2bfd3e2f3..8bcc4eed7b8ffdd3b2fcb067883154c465a3349f 100644
--- a/cc/trees/layer_tree_host_impl.cc
+++ b/cc/trees/layer_tree_host_impl.cc
@@ -3370,8 +3370,13 @@ static void CollectScrollDeltas(ScrollAndScaleSet* scroll_info,
if (tree_impl->LayerListIsEmpty())
return;
+ int inner_viewport_layer_id =
+ tree_impl->InnerViewportScrollLayer()
+ ? tree_impl->InnerViewportScrollLayer()->id()
+ : Layer::INVALID_ID;
+
return tree_impl->property_trees()->scroll_tree.CollectScrollDeltas(
- scroll_info);
+ scroll_info, inner_viewport_layer_id);
}
std::unique_ptr<ScrollAndScaleSet> LayerTreeHostImpl::ProcessScrollDeltas() {

Powered by Google App Engine
This is Rietveld 408576698