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

Unified Diff: cc/layers/layer_impl.cc

Issue 2382913003: Revert of Fix scroll chaining for non-descendants of root scroller. (Closed)
Patch Set: Created 4 years, 3 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/layers/layer_impl.h ('k') | cc/trees/layer_tree_host_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/layers/layer_impl.cc
diff --git a/cc/layers/layer_impl.cc b/cc/layers/layer_impl.cc
index 00557e328a07ffc6a1e657b48453a777338341cb..03aa4aefbad7bc8394b289276af9e8becb67fc68 100644
--- a/cc/layers/layer_impl.cc
+++ b/cc/layers/layer_impl.cc
@@ -125,7 +125,14 @@
void LayerImpl::DistributeScroll(ScrollState* scroll_state) {
ScrollTree& scroll_tree = layer_tree_impl()->property_trees()->scroll_tree;
ScrollNode* scroll_node = scroll_tree.Node(scroll_tree_index());
- scroll_tree.DistributeScroll(scroll_node, scroll_state);
+ return scroll_tree.DistributeScroll(scroll_node, scroll_state);
+}
+
+void LayerImpl::ApplyScroll(ScrollState* scroll_state) {
+ DCHECK(scroll_state);
+ ScrollNode* node = layer_tree_impl()->property_trees()->scroll_tree.Node(
+ scroll_tree_index());
+ layer_tree_impl()->ApplyScroll(node, scroll_state);
}
void LayerImpl::SetTransformTreeIndex(int index) {
« no previous file with comments | « cc/layers/layer_impl.h ('k') | cc/trees/layer_tree_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698