Rename ScrollNode's scroll_clip_layer_bounds to container_bounds
With [1], a scroll node's container bounds no longer necessarily
clip, and no longer refer to a clip layer. This change renames ScrollNode's
members/functions to reflect the new meaning of these bounds.
[1] https://chromium.googlesource.com/chromium/src.git/+/bbfd882e098b95178a373cbaa079636490f2f3f4
Bug: 723263
Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel;master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
Change-Id: I3f9e4f797f150776113868e911d53f53e10cf719
Reviewed-on: https://chromium-review.googlesource.com/557973
Reviewed-by: Chris Harrelson <[email protected]>
Commit-Queue: Philip Rogers <[email protected]>
Cr-Commit-Position: refs/heads/master@{#483862}diff --git a/cc/trees/layer_tree_host_common_unittest.cc b/cc/trees/layer_tree_host_common_unittest.cc
index f7210f02..4c17b80 100644
--- a/cc/trees/layer_tree_host_common_unittest.cc
+++ b/cc/trees/layer_tree_host_common_unittest.cc
@@ -10090,7 +10090,7 @@
scroll_parent2.scrollable = true;
scroll_parent2.main_thread_scrolling_reasons =
parent2->main_thread_scrolling_reasons();
- scroll_parent2.scroll_clip_layer_bounds = root1->bounds();
+ scroll_parent2.container_bounds = root1->bounds();
scroll_parent2.bounds = parent2->bounds();
scroll_parent2.max_scroll_offset_affected_by_page_scale = true;
scroll_parent2.scrolls_inner_viewport = true;
@@ -10117,7 +10117,7 @@
scroll_child7.owning_layer_id = child7->id();
scroll_child7.element_id = child7->element_id();
scroll_child7.scrollable = true;
- scroll_child7.scroll_clip_layer_bounds = parent3->bounds();
+ scroll_child7.container_bounds = parent3->bounds();
scroll_child7.bounds = child7->bounds();
scroll_child7.user_scrollable_horizontal = true;
scroll_child7.user_scrollable_vertical = true;
@@ -10130,7 +10130,7 @@
scroll_grand_child11.owning_layer_id = grand_child11->id();
scroll_grand_child11.element_id = grand_child11->element_id();
scroll_grand_child11.scrollable = true;
- scroll_grand_child11.scroll_clip_layer_bounds = child8->bounds();
+ scroll_grand_child11.container_bounds = child8->bounds();
scroll_grand_child11.user_scrollable_horizontal = true;
scroll_grand_child11.user_scrollable_vertical = true;
scroll_grand_child11.transform_id = grand_child11->transform_tree_index();
