Index: cc/trees/layer_tree_host_unittest.cc |
diff --git a/cc/trees/layer_tree_host_unittest.cc b/cc/trees/layer_tree_host_unittest.cc |
index 5737b420e74ed1dbca0da4e773b787bdd67d4b5c..2b231690239bce52a89d151e826a03fef7a647d3 100644 |
--- a/cc/trees/layer_tree_host_unittest.cc |
+++ b/cc/trees/layer_tree_host_unittest.cc |
@@ -1137,9 +1137,17 @@ class LayerTreeHostTestStartPageScaleAnimation : public LayerTreeHostTest { |
scroll_layer_ = FakeContentLayer::Create(&client_); |
} |
- scroll_layer_->SetScrollable(true); |
+ Layer* root_layer = layer_tree_host()->root_layer(); |
+ scroll_layer_->SetScrollClipLayerId(root_layer->id()); |
+ scroll_layer_->SetIsContainerForFixedPositionLayers(true); |
+ scroll_layer_->SetBounds(gfx::Size(2 * root_layer->bounds().width(), |
+ 2 * root_layer->bounds().height())); |
scroll_layer_->SetScrollOffset(gfx::Vector2d()); |
layer_tree_host()->root_layer()->AddChild(scroll_layer_); |
+ // This test requires the page_scale and inner viewport layers to be |
+ // identified. |
+ layer_tree_host()->RegisterViewportLayers( |
+ root_layer, scroll_layer_.get(), NULL); |
layer_tree_host()->SetPageScaleFactorAndLimits(1.f, 0.5f, 2.f); |
} |