| Index: cc/trees/layer_tree_host_impl_unittest.cc
|
| diff --git a/cc/trees/layer_tree_host_impl_unittest.cc b/cc/trees/layer_tree_host_impl_unittest.cc
|
| index 600047c81a574844922f1a18491968e58273646d..97713e5ccba24bb631d0af12488995e3d48bdd2c 100644
|
| --- a/cc/trees/layer_tree_host_impl_unittest.cc
|
| +++ b/cc/trees/layer_tree_host_impl_unittest.cc
|
| @@ -5241,6 +5241,7 @@ TEST_F(LayerTreeHostImplTest, ScrollViewportRounding) {
|
| SetupScrollAndContentsLayers(gfx::Size(width, height));
|
| host_impl_->active_tree()->InnerViewportContainerLayer()->SetBounds(
|
| gfx::Size(width * scale - 1, height * scale));
|
| + RebuildPropertyTrees();
|
| host_impl_->active_tree()->SetDeviceScaleFactor(scale);
|
| host_impl_->active_tree()->PushPageScaleFromMainThread(1.f, 0.5f, 4.f);
|
|
|
| @@ -5319,6 +5320,7 @@ TEST_F(LayerTreeHostImplTest, RootLayerScrollOffsetDelegation) {
|
| LayerImpl* scroll_layer = SetupScrollAndContentsLayers(gfx::Size(100, 100));
|
| LayerImpl* clip_layer = scroll_layer->parent()->parent();
|
| clip_layer->SetBounds(gfx::Size(10, 20));
|
| + RebuildPropertyTrees();
|
|
|
| host_impl_->BindToClient(&scroll_watcher);
|
|
|
| @@ -5689,6 +5691,7 @@ TEST_F(LayerTreeHostImplTest, OverscrollAlways) {
|
| LayerImpl* scroll_layer = SetupScrollAndContentsLayers(gfx::Size(50, 50));
|
| LayerImpl* clip_layer = scroll_layer->parent()->parent();
|
| clip_layer->SetBounds(gfx::Size(50, 50));
|
| + RebuildPropertyTrees();
|
| host_impl_->SetViewportSize(gfx::Size(50, 50));
|
| host_impl_->active_tree()->PushPageScaleFromMainThread(1.f, 0.5f, 4.f);
|
| DrawFrame();
|
| @@ -9902,7 +9905,8 @@ TEST_F(LayerTreeHostImplTest, UpdatePageScaleFactorOnActiveTree) {
|
| TransformNode* active_tree_node =
|
| host_impl_->active_tree()->property_trees()->transform_tree.Node(
|
| page_scale_layer->transform_tree_index());
|
| - EXPECT_EQ(active_tree_node->data.post_local_scale_factor, 1.f);
|
| + // SetPageScaleOnActiveTree also updates the factors in property trees.
|
| + EXPECT_EQ(active_tree_node->data.post_local_scale_factor, 2.f);
|
| EXPECT_EQ(host_impl_->active_tree()->current_page_scale_factor(), 2.f);
|
|
|
| TransformNode* pending_tree_node =
|
|
|