| Index: cc/trees/layer_tree.cc
|
| diff --git a/cc/trees/layer_tree.cc b/cc/trees/layer_tree.cc
|
| index 2572472153a27ea1d5ff6256bf39f8afebaa9252..5f5e5519474168b9e55f8042c6ff3b599fdaeaa4 100644
|
| --- a/cc/trees/layer_tree.cc
|
| +++ b/cc/trees/layer_tree.cc
|
| @@ -322,8 +322,7 @@ void LayerTree::SetPropertyTreesNeedRebuild() {
|
| layer_tree_host_->SetNeedsUpdateLayers();
|
| }
|
|
|
| -void LayerTree::PushPropertiesTo(LayerTreeImpl* tree_impl,
|
| - float unapplied_page_scale_delta) {
|
| +void LayerTree::PushPropertiesTo(LayerTreeImpl* tree_impl) {
|
| tree_impl->set_needs_full_tree_sync(needs_full_tree_sync_);
|
| needs_full_tree_sync_ = false;
|
|
|
| @@ -380,9 +379,9 @@ void LayerTree::PushPropertiesTo(LayerTreeImpl* tree_impl,
|
| // Setting property trees must happen before pushing the page scale.
|
| tree_impl->SetPropertyTrees(&property_trees_);
|
|
|
| - tree_impl->PushPageScaleFromMainThread(
|
| - inputs_.page_scale_factor * unapplied_page_scale_delta,
|
| - inputs_.min_page_scale_factor, inputs_.max_page_scale_factor);
|
| + tree_impl->PushPageScaleFromMainThread(inputs_.page_scale_factor,
|
| + inputs_.min_page_scale_factor,
|
| + inputs_.max_page_scale_factor);
|
|
|
| tree_impl->set_browser_controls_shrink_blink_size(
|
| inputs_.browser_controls_shrink_blink_size);
|
|
|