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

Unified Diff: cc/trees/layer_tree_host_unittest.cc

Issue 23983047: Pinch/Zoom Infrastructure & Plumbing CL (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Use layer ids instead of pointers for registering scroll/clip layers. Created 6 years, 11 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/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);
}

Powered by Google App Engine
This is Rietveld 408576698