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

Unified Diff: cc/trees/property_tree_builder.cc

Issue 1766053002: Clean LayerImpl's scroll offset callers in unit tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 9 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
« cc/trees/property_tree.h ('K') | « cc/trees/property_tree.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: cc/trees/property_tree_builder.cc
diff --git a/cc/trees/property_tree_builder.cc b/cc/trees/property_tree_builder.cc
index 14338a4cd304020f7bc44b80bedb764a4b972271..4096d335907fef086b98f6b69d1f014585869259 100644
--- a/cc/trees/property_tree_builder.cc
+++ b/cc/trees/property_tree_builder.cc
@@ -672,6 +672,10 @@ void AddScrollNodeIfNeeded(
data_from_ancestor
.scroll_tree_parent_created_by_uninheritable_criteria));
+ // Remove the entry from scroll_offset_map
+ if (!scrollable)
+ data_for_children->scroll_tree->scroll_offset_map().erase(layer->id());
ajuma 2016/03/07 19:10:19 Is this only needed for tests? If so, please add a
sunxd 2016/03/09 01:51:21 Done.
+
if (!requires_node) {
data_for_children->scroll_tree_parent = parent_id;
} else {
« cc/trees/property_tree.h ('K') | « cc/trees/property_tree.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698