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

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

Issue 2027073002: cc : Use transform node data to determine which transform wins at commit (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 6 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/layer_tree_impl.cc ('k') | no next file » | 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 498 matching lines...) Expand 10 before | Expand all | Expand 10 after
509 509
510 node->data.target_id = data_for_children->property_trees->effect_tree 510 node->data.target_id = data_for_children->property_trees->effect_tree
511 .Node(data_from_ancestor.render_target) 511 .Node(data_from_ancestor.render_target)
512 ->data.transform_id; 512 ->data.transform_id;
513 node->data.content_target_id = data_for_children->property_trees->effect_tree 513 node->data.content_target_id = data_for_children->property_trees->effect_tree
514 .Node(data_for_children->render_target) 514 .Node(data_for_children->render_target)
515 ->data.transform_id; 515 ->data.transform_id;
516 DCHECK_NE(node->data.target_id, kInvalidPropertyTreeNodeId); 516 DCHECK_NE(node->data.target_id, kInvalidPropertyTreeNodeId);
517 517
518 node->data.has_potential_animation = has_potentially_animated_transform; 518 node->data.has_potential_animation = has_potentially_animated_transform;
519 node->data.is_currently_animating = layer->TransformIsAnimating();
519 if (has_potentially_animated_transform) { 520 if (has_potentially_animated_transform) {
520 float maximum_animation_target_scale = 0.f; 521 float maximum_animation_target_scale = 0.f;
521 if (layer->MaximumTargetScale(&maximum_animation_target_scale)) { 522 if (layer->MaximumTargetScale(&maximum_animation_target_scale)) {
522 node->data.local_maximum_animation_target_scale = 523 node->data.local_maximum_animation_target_scale =
523 maximum_animation_target_scale; 524 maximum_animation_target_scale;
524 } 525 }
525 526
526 float starting_animation_scale = 0.f; 527 float starting_animation_scale = 0.f;
527 if (layer->AnimationStartScale(&starting_animation_scale)) { 528 if (layer->AnimationStartScale(&starting_animation_scale)) {
528 node->data.local_starting_animation_scale = starting_animation_scale; 529 node->data.local_starting_animation_scale = starting_animation_scale;
(...skipping 780 matching lines...) Expand 10 before | Expand all | Expand 10 after
1309 if (SkColorGetA(color) != 255) 1310 if (SkColorGetA(color) != 255)
1310 color = SkColorSetA(color, 255); 1311 color = SkColorSetA(color, 255);
1311 BuildPropertyTreesTopLevelInternal( 1312 BuildPropertyTreesTopLevelInternal(
1312 root_layer, page_scale_layer, inner_viewport_scroll_layer, 1313 root_layer, page_scale_layer, inner_viewport_scroll_layer,
1313 outer_viewport_scroll_layer, overscroll_elasticity_layer, 1314 outer_viewport_scroll_layer, overscroll_elasticity_layer,
1314 elastic_overscroll, page_scale_factor, device_scale_factor, viewport, 1315 elastic_overscroll, page_scale_factor, device_scale_factor, viewport,
1315 device_transform, property_trees, color); 1316 device_transform, property_trees, color);
1316 } 1317 }
1317 1318
1318 } // namespace cc 1319 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_impl.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698