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

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

Issue 1987123002: cc : Track transform animation changes on transform tree (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 7 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
« no previous file with comments | « cc/trees/property_tree.cc ('k') | cc/trees/property_tree_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/property_tree_builder.h" 5 #include "cc/trees/property_tree_builder.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 496 matching lines...) Expand 10 before | Expand all | Expand 10 after
507 DCHECK_GT(data_from_ancestor.property_trees->effect_tree.size(), 0u); 507 DCHECK_GT(data_from_ancestor.property_trees->effect_tree.size(), 0u);
508 508
509 node->data.target_id = data_for_children->property_trees->effect_tree 509 node->data.target_id = data_for_children->property_trees->effect_tree
510 .Node(data_from_ancestor.render_target) 510 .Node(data_from_ancestor.render_target)
511 ->data.transform_id; 511 ->data.transform_id;
512 node->data.content_target_id = data_for_children->property_trees->effect_tree 512 node->data.content_target_id = data_for_children->property_trees->effect_tree
513 .Node(data_for_children->render_target) 513 .Node(data_for_children->render_target)
514 ->data.transform_id; 514 ->data.transform_id;
515 DCHECK_NE(node->data.target_id, kInvalidPropertyTreeNodeId); 515 DCHECK_NE(node->data.target_id, kInvalidPropertyTreeNodeId);
516 516
517 node->data.is_animated = has_potentially_animated_transform; 517 node->data.has_potential_animation = has_potentially_animated_transform;
518 if (has_potentially_animated_transform) { 518 if (has_potentially_animated_transform) {
519 float maximum_animation_target_scale = 0.f; 519 float maximum_animation_target_scale = 0.f;
520 if (layer->MaximumTargetScale(&maximum_animation_target_scale)) { 520 if (layer->MaximumTargetScale(&maximum_animation_target_scale)) {
521 node->data.local_maximum_animation_target_scale = 521 node->data.local_maximum_animation_target_scale =
522 maximum_animation_target_scale; 522 maximum_animation_target_scale;
523 } 523 }
524 524
525 float starting_animation_scale = 0.f; 525 float starting_animation_scale = 0.f;
526 if (layer->AnimationStartScale(&starting_animation_scale)) { 526 if (layer->AnimationStartScale(&starting_animation_scale)) {
527 node->data.local_starting_animation_scale = starting_animation_scale; 527 node->data.local_starting_animation_scale = starting_animation_scale;
(...skipping 736 matching lines...) Expand 10 before | Expand all | Expand 10 after
1264 if (SkColorGetA(color) != 255) 1264 if (SkColorGetA(color) != 255)
1265 color = SkColorSetA(color, 255); 1265 color = SkColorSetA(color, 255);
1266 BuildPropertyTreesTopLevelInternal( 1266 BuildPropertyTreesTopLevelInternal(
1267 root_layer, page_scale_layer, inner_viewport_scroll_layer, 1267 root_layer, page_scale_layer, inner_viewport_scroll_layer,
1268 outer_viewport_scroll_layer, overscroll_elasticity_layer, 1268 outer_viewport_scroll_layer, overscroll_elasticity_layer,
1269 elastic_overscroll, page_scale_factor, device_scale_factor, viewport, 1269 elastic_overscroll, page_scale_factor, device_scale_factor, viewport,
1270 device_transform, property_trees, color); 1270 device_transform, property_trees, color);
1271 } 1271 }
1272 1272
1273 } // namespace cc 1273 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/property_tree.cc ('k') | cc/trees/property_tree_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698