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

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

Issue 2148383005: cc: Use sublayer scale from effect tree (2) (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: s/sublayer_scale/surface_contents_scale 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/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 618 matching lines...) Expand 10 before | Expand all | Expand 10 after
629 post_local_scale_factor = 629 post_local_scale_factor =
630 data_for_children->property_trees->transform_tree.device_scale_factor(); 630 data_for_children->property_trees->transform_tree.device_scale_factor();
631 631
632 if (is_page_scale_layer) { 632 if (is_page_scale_layer) {
633 post_local_scale_factor *= data_from_ancestor.page_scale_factor; 633 post_local_scale_factor *= data_from_ancestor.page_scale_factor;
634 data_for_children->property_trees->transform_tree.set_page_scale_factor( 634 data_for_children->property_trees->transform_tree.set_page_scale_factor(
635 data_from_ancestor.page_scale_factor); 635 data_from_ancestor.page_scale_factor);
636 } 636 }
637 637
638 if (has_surface && !is_root) 638 if (has_surface && !is_root)
639 node->needs_sublayer_scale = true; 639 node->needs_surface_contents_scale = true;
640 640
641 node->source_node_id = source_index; 641 node->source_node_id = source_index;
642 node->post_local_scale_factor = post_local_scale_factor; 642 node->post_local_scale_factor = post_local_scale_factor;
643 if (is_root) { 643 if (is_root) {
644 data_for_children->property_trees->transform_tree.SetDeviceTransform( 644 data_for_children->property_trees->transform_tree.SetDeviceTransform(
645 *data_from_ancestor.device_transform, layer->position()); 645 *data_from_ancestor.device_transform, layer->position());
646 data_for_children->property_trees->transform_tree 646 data_for_children->property_trees->transform_tree
647 .SetDeviceTransformScaleFactor(*data_from_ancestor.device_transform); 647 .SetDeviceTransformScaleFactor(*data_from_ancestor.device_transform);
648 } else { 648 } else {
649 node->source_offset = source_offset; 649 node->source_offset = source_offset;
(...skipping 789 matching lines...) Expand 10 before | Expand all | Expand 10 after
1439 color = SkColorSetA(color, 255); 1439 color = SkColorSetA(color, 255);
1440 BuildPropertyTreesTopLevelInternal( 1440 BuildPropertyTreesTopLevelInternal(
1441 root_layer, page_scale_layer, inner_viewport_scroll_layer, 1441 root_layer, page_scale_layer, inner_viewport_scroll_layer,
1442 outer_viewport_scroll_layer, overscroll_elasticity_layer, 1442 outer_viewport_scroll_layer, overscroll_elasticity_layer,
1443 elastic_overscroll, page_scale_factor, device_scale_factor, viewport, 1443 elastic_overscroll, page_scale_factor, device_scale_factor, viewport,
1444 device_transform, property_trees, color); 1444 device_transform, property_trees, color);
1445 property_trees->ResetCachedData(); 1445 property_trees->ResetCachedData();
1446 } 1446 }
1447 1447
1448 } // namespace cc 1448 } // namespace cc
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698