Chromium Code Reviews| Index: cc/trees/draw_property_utils.cc |
| diff --git a/cc/trees/draw_property_utils.cc b/cc/trees/draw_property_utils.cc |
| index d46151d683598cdf8f0e0e53c3f8ae36c3585c0e..50c2b90e22594d9278645725e350df498b70e5f3 100644 |
| --- a/cc/trees/draw_property_utils.cc |
| +++ b/cc/trees/draw_property_utils.cc |
| @@ -1209,17 +1209,6 @@ void ComputeLayerDrawProperties(LayerImpl* layer, |
| } |
| layer->draw_properties().screen_space_transform_is_animating = |
| transform_node->data.to_screen_is_potentially_animated; |
| - if (layer->layer_tree_impl() |
| - ->settings() |
| - .layer_transforms_should_scale_layer_contents) { |
| - layer->draw_properties().maximum_animation_contents_scale = |
| - transform_node->data.combined_maximum_animation_target_scale; |
| - layer->draw_properties().starting_animation_contents_scale = |
| - transform_node->data.combined_starting_animation_scale; |
| - } else { |
| - layer->draw_properties().maximum_animation_contents_scale = 0.f; |
| - layer->draw_properties().starting_animation_contents_scale = 0.f; |
|
ajuma
2016/06/29 15:04:37
Please make sure the new logic also uses scale 0 w
sunxd
2016/06/30 15:29:44
Done.
|
| - } |
| layer->draw_properties().opacity = |
| LayerDrawOpacity(layer, property_trees->effect_tree); |