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

Unified Diff: cc/test/fake_layer_tree_host.cc

Issue 2183403002: cc: Move data to LayerTree from LayerTreeHost. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@layer_tree_change
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/test/fake_layer_tree_host.cc
diff --git a/cc/test/fake_layer_tree_host.cc b/cc/test/fake_layer_tree_host.cc
index ac270c9b938ba2da9e88f206737a96b229294380..9ee1a24ec285d5301f047d4fb7999819e6c563be 100644
--- a/cc/test/fake_layer_tree_host.cc
+++ b/cc/test/fake_layer_tree_host.cc
@@ -95,13 +95,17 @@ LayerImpl* FakeLayerTreeHost::CommitAndCreateLayerImplTree() {
active_tree()->UpdatePropertyTreeScrollOffset(property_trees());
- if (page_scale_layer() && inner_viewport_scroll_layer()) {
+ if (layer_tree_.page_scale_layer() &&
+ layer_tree_.inner_viewport_scroll_layer()) {
active_tree()->SetViewportLayersFromIds(
- overscroll_elasticity_layer() ? overscroll_elasticity_layer()->id()
- : Layer::INVALID_ID,
- page_scale_layer()->id(), inner_viewport_scroll_layer()->id(),
- outer_viewport_scroll_layer() ? outer_viewport_scroll_layer()->id()
- : Layer::INVALID_ID);
+ layer_tree_.overscroll_elasticity_layer()
+ ? layer_tree_.overscroll_elasticity_layer()->id()
+ : Layer::INVALID_ID,
+ layer_tree_.page_scale_layer()->id(),
+ layer_tree_.inner_viewport_scroll_layer()->id(),
+ layer_tree_.outer_viewport_scroll_layer()
+ ? layer_tree_.outer_viewport_scroll_layer()->id()
+ : Layer::INVALID_ID);
}
active_tree()->UpdatePropertyTreesForBoundsDelta();

Powered by Google App Engine
This is Rietveld 408576698