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

Side by Side Diff: cc/trees/draw_property_utils.cc

Issue 2105673003: cc: Compute animation scale on demand (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix compile error Created 4 years, 5 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "cc/trees/draw_property_utils.h" 5 #include "cc/trees/draw_property_utils.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1191 matching lines...) Expand 10 before | Expand all | Expand 10 after
1202 ScreenSpaceTransformInternal(layer, property_trees->transform_tree); 1202 ScreenSpaceTransformInternal(layer, property_trees->transform_tree);
1203 if (property_trees->non_root_surfaces_enabled) { 1203 if (property_trees->non_root_surfaces_enabled) {
1204 layer->draw_properties().target_space_transform = 1204 layer->draw_properties().target_space_transform =
1205 DrawTransform(layer, property_trees->transform_tree); 1205 DrawTransform(layer, property_trees->transform_tree);
1206 } else { 1206 } else {
1207 layer->draw_properties().target_space_transform = 1207 layer->draw_properties().target_space_transform =
1208 layer->draw_properties().screen_space_transform; 1208 layer->draw_properties().screen_space_transform;
1209 } 1209 }
1210 layer->draw_properties().screen_space_transform_is_animating = 1210 layer->draw_properties().screen_space_transform_is_animating =
1211 transform_node->data.to_screen_is_potentially_animated; 1211 transform_node->data.to_screen_is_potentially_animated;
1212 if (layer->layer_tree_impl()
1213 ->settings()
1214 .layer_transforms_should_scale_layer_contents) {
1215 layer->draw_properties().maximum_animation_contents_scale =
1216 transform_node->data.combined_maximum_animation_target_scale;
1217 layer->draw_properties().starting_animation_contents_scale =
1218 transform_node->data.combined_starting_animation_scale;
1219 } else {
1220 layer->draw_properties().maximum_animation_contents_scale = 0.f;
1221 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.
1222 }
1223 1212
1224 layer->draw_properties().opacity = 1213 layer->draw_properties().opacity =
1225 LayerDrawOpacity(layer, property_trees->effect_tree); 1214 LayerDrawOpacity(layer, property_trees->effect_tree);
1226 if (property_trees->non_root_surfaces_enabled) { 1215 if (property_trees->non_root_surfaces_enabled) {
1227 layer->draw_properties().is_clipped = clip_node->data.layers_are_clipped; 1216 layer->draw_properties().is_clipped = clip_node->data.layers_are_clipped;
1228 } else { 1217 } else {
1229 layer->draw_properties().is_clipped = 1218 layer->draw_properties().is_clipped =
1230 clip_node->data.layers_are_clipped_when_surfaces_disabled; 1219 clip_node->data.layers_are_clipped_when_surfaces_disabled;
1231 } 1220 }
1232 1221
(...skipping 139 matching lines...) Expand 10 before | Expand all | Expand 10 after
1372 void UpdateElasticOverscroll(PropertyTrees* property_trees, 1361 void UpdateElasticOverscroll(PropertyTrees* property_trees,
1373 const Layer* overscroll_elasticity_layer, 1362 const Layer* overscroll_elasticity_layer,
1374 const gfx::Vector2dF& elastic_overscroll) { 1363 const gfx::Vector2dF& elastic_overscroll) {
1375 UpdateElasticOverscrollInternal(property_trees, overscroll_elasticity_layer, 1364 UpdateElasticOverscrollInternal(property_trees, overscroll_elasticity_layer,
1376 elastic_overscroll); 1365 elastic_overscroll);
1377 } 1366 }
1378 1367
1379 } // namespace draw_property_utils 1368 } // namespace draw_property_utils
1380 1369
1381 } // namespace cc 1370 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698