Chromium Code Reviews| Index: cc/trees/layer_tree.cc |
| diff --git a/cc/trees/layer_tree.cc b/cc/trees/layer_tree.cc |
| index 3d46e3fae10b4ccb39fac6c7b0116a0f9f1cd40c..c0d4361c55ef46bf8c2d937097340d49acd2856a 100644 |
| --- a/cc/trees/layer_tree.cc |
| +++ b/cc/trees/layer_tree.cc |
| @@ -343,7 +343,8 @@ void LayerTree::SetPropertyTreesNeedRebuild() { |
| layer_tree_host_->SetNeedsUpdateLayers(); |
| } |
| -void LayerTree::PushPropertiesTo(LayerTreeImpl* tree_impl) { |
| +void LayerTree::PushPropertiesTo(LayerTreeImpl* tree_impl, |
| + float unapplied_page_scale_delta) { |
| tree_impl->set_needs_full_tree_sync(needs_full_tree_sync_); |
| needs_full_tree_sync_ = false; |
| @@ -400,9 +401,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, |
| - inputs_.min_page_scale_factor, |
| - inputs_.max_page_scale_factor); |
| + tree_impl->PushPageScaleFromMainThread( |
| + inputs_.page_scale_factor * unapplied_page_scale_delta, |
|
aelias_OOO_until_Jul13
2016/10/28 03:40:20
Hmm, this resembles the approach I suggested for s
Khushal
2016/10/31 21:02:01
I did a little bit more digging, and finally lande
|
| + inputs_.min_page_scale_factor, inputs_.max_page_scale_factor); |
| tree_impl->set_top_controls_shrink_blink_size( |
| inputs_.top_controls_shrink_blink_size); |