| 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();
|
|
|