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

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

Issue 2032213002: cc: Put to_target and to_screen behind an accessor. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase 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/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 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
496 if (layer == data_from_ancestor.page_scale_layer) 496 if (layer == data_from_ancestor.page_scale_layer)
497 data_for_children->in_subtree_of_page_scale_layer = true; 497 data_for_children->in_subtree_of_page_scale_layer = true;
498 node->data.in_subtree_of_page_scale_layer = 498 node->data.in_subtree_of_page_scale_layer =
499 data_for_children->in_subtree_of_page_scale_layer; 499 data_for_children->in_subtree_of_page_scale_layer;
500 500
501 // Surfaces inherently flatten transforms. 501 // Surfaces inherently flatten transforms.
502 data_for_children->should_flatten = 502 data_for_children->should_flatten =
503 ShouldFlattenTransform(layer) || has_surface; 503 ShouldFlattenTransform(layer) || has_surface;
504 DCHECK_GT(data_from_ancestor.property_trees->effect_tree.size(), 0u); 504 DCHECK_GT(data_from_ancestor.property_trees->effect_tree.size(), 0u);
505 505
506 node->data.target_id = data_for_children->property_trees->effect_tree 506 data_for_children->property_trees->transform_tree.SetTargetId(
507 .Node(data_from_ancestor.render_target) 507 node->id, data_for_children->property_trees->effect_tree
508 ->data.transform_id; 508 .Node(data_from_ancestor.render_target)
509 node->data.content_target_id = data_for_children->property_trees->effect_tree 509 ->data.transform_id);
510 .Node(data_for_children->render_target) 510 data_for_children->property_trees->transform_tree.SetContentTargetId(
511 ->data.transform_id; 511 node->id, data_for_children->property_trees->effect_tree
512 DCHECK_NE(node->data.target_id, kInvalidPropertyTreeNodeId); 512 .Node(data_for_children->render_target)
513 ->data.transform_id);
514 DCHECK_NE(
515 data_for_children->property_trees->transform_tree.TargetId(node->id),
516 kInvalidPropertyTreeNodeId);
513 517
514 node->data.has_potential_animation = has_potentially_animated_transform; 518 node->data.has_potential_animation = has_potentially_animated_transform;
515 node->data.is_currently_animating = layer->TransformIsAnimating(); 519 node->data.is_currently_animating = layer->TransformIsAnimating();
516 if (has_potentially_animated_transform) { 520 if (has_potentially_animated_transform) {
517 float maximum_animation_target_scale = 0.f; 521 float maximum_animation_target_scale = 0.f;
518 if (layer->MaximumTargetScale(&maximum_animation_target_scale)) { 522 if (layer->MaximumTargetScale(&maximum_animation_target_scale)) {
519 node->data.local_maximum_animation_target_scale = 523 node->data.local_maximum_animation_target_scale =
520 maximum_animation_target_scale; 524 maximum_animation_target_scale;
521 } 525 }
522 526
(...skipping 803 matching lines...) Expand 10 before | Expand all | Expand 10 after
1326 if (SkColorGetA(color) != 255) 1330 if (SkColorGetA(color) != 255)
1327 color = SkColorSetA(color, 255); 1331 color = SkColorSetA(color, 255);
1328 BuildPropertyTreesTopLevelInternal( 1332 BuildPropertyTreesTopLevelInternal(
1329 root_layer, page_scale_layer, inner_viewport_scroll_layer, 1333 root_layer, page_scale_layer, inner_viewport_scroll_layer,
1330 outer_viewport_scroll_layer, overscroll_elasticity_layer, 1334 outer_viewport_scroll_layer, overscroll_elasticity_layer,
1331 elastic_overscroll, page_scale_factor, device_scale_factor, viewport, 1335 elastic_overscroll, page_scale_factor, device_scale_factor, viewport,
1332 device_transform, property_trees, color); 1336 device_transform, property_trees, color);
1333 } 1337 }
1334 1338
1335 } // namespace cc 1339 } // 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