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

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

Issue 1800923002: cc: Directly use property trees to calculate clip rect (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix perftests compile by not verify clip tree calc there 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/layer_tree_host_common.h ('k') | cc/trees/layer_tree_host_common_perftest.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 2011 The Chromium Authors. All rights reserved. 1 // Copyright 2011 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/layer_tree_host_common.h" 5 #include "cc/trees/layer_tree_host_common.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <algorithm> 9 #include <algorithm>
10 10
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 const LayerImpl* page_scale_layer, 75 const LayerImpl* page_scale_layer,
76 const LayerImpl* inner_viewport_scroll_layer, 76 const LayerImpl* inner_viewport_scroll_layer,
77 const LayerImpl* outer_viewport_scroll_layer, 77 const LayerImpl* outer_viewport_scroll_layer,
78 const gfx::Vector2dF& elastic_overscroll, 78 const gfx::Vector2dF& elastic_overscroll,
79 const LayerImpl* elastic_overscroll_application_layer, 79 const LayerImpl* elastic_overscroll_application_layer,
80 int max_texture_size, 80 int max_texture_size,
81 bool can_use_lcd_text, 81 bool can_use_lcd_text,
82 bool layers_always_allowed_lcd_text, 82 bool layers_always_allowed_lcd_text,
83 bool can_render_to_separate_surface, 83 bool can_render_to_separate_surface,
84 bool can_adjust_raster_scales, 84 bool can_adjust_raster_scales,
85 bool verify_clip_tree_calculations,
85 LayerImplList* render_surface_layer_list, 86 LayerImplList* render_surface_layer_list,
86 PropertyTrees* property_trees) 87 PropertyTrees* property_trees)
87 : root_layer(root_layer), 88 : root_layer(root_layer),
88 device_viewport_size(device_viewport_size), 89 device_viewport_size(device_viewport_size),
89 device_transform(device_transform), 90 device_transform(device_transform),
90 device_scale_factor(device_scale_factor), 91 device_scale_factor(device_scale_factor),
91 page_scale_factor(page_scale_factor), 92 page_scale_factor(page_scale_factor),
92 page_scale_layer(page_scale_layer), 93 page_scale_layer(page_scale_layer),
93 inner_viewport_scroll_layer(inner_viewport_scroll_layer), 94 inner_viewport_scroll_layer(inner_viewport_scroll_layer),
94 outer_viewport_scroll_layer(outer_viewport_scroll_layer), 95 outer_viewport_scroll_layer(outer_viewport_scroll_layer),
95 elastic_overscroll(elastic_overscroll), 96 elastic_overscroll(elastic_overscroll),
96 elastic_overscroll_application_layer( 97 elastic_overscroll_application_layer(
97 elastic_overscroll_application_layer), 98 elastic_overscroll_application_layer),
98 max_texture_size(max_texture_size), 99 max_texture_size(max_texture_size),
99 can_use_lcd_text(can_use_lcd_text), 100 can_use_lcd_text(can_use_lcd_text),
100 layers_always_allowed_lcd_text(layers_always_allowed_lcd_text), 101 layers_always_allowed_lcd_text(layers_always_allowed_lcd_text),
101 can_render_to_separate_surface(can_render_to_separate_surface), 102 can_render_to_separate_surface(can_render_to_separate_surface),
102 can_adjust_raster_scales(can_adjust_raster_scales), 103 can_adjust_raster_scales(can_adjust_raster_scales),
104 verify_clip_tree_calculations(verify_clip_tree_calculations),
103 render_surface_layer_list(render_surface_layer_list), 105 render_surface_layer_list(render_surface_layer_list),
104 property_trees(property_trees) {} 106 property_trees(property_trees) {}
105 107
106 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting:: 108 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting::
107 CalcDrawPropsImplInputsForTesting(LayerImpl* root_layer, 109 CalcDrawPropsImplInputsForTesting(LayerImpl* root_layer,
108 const gfx::Size& device_viewport_size, 110 const gfx::Size& device_viewport_size,
109 const gfx::Transform& device_transform, 111 const gfx::Transform& device_transform,
110 LayerImplList* render_surface_layer_list) 112 LayerImplList* render_surface_layer_list)
111 : CalcDrawPropsImplInputs(root_layer, 113 : CalcDrawPropsImplInputs(root_layer,
112 device_viewport_size, 114 device_viewport_size,
113 device_transform, 115 device_transform,
114 1.f, 116 1.f,
115 1.f, 117 1.f,
116 NULL, 118 NULL,
117 NULL, 119 NULL,
118 NULL, 120 NULL,
119 gfx::Vector2dF(), 121 gfx::Vector2dF(),
120 NULL, 122 NULL,
121 std::numeric_limits<int>::max() / 2, 123 std::numeric_limits<int>::max() / 2,
122 false, 124 false,
123 false, 125 false,
124 true, 126 true,
125 false, 127 false,
128 true,
126 render_surface_layer_list, 129 render_surface_layer_list,
127 GetPropertyTrees(root_layer)) { 130 GetPropertyTrees(root_layer)) {
128 DCHECK(root_layer); 131 DCHECK(root_layer);
129 DCHECK(render_surface_layer_list); 132 DCHECK(render_surface_layer_list);
130 } 133 }
131 134
132 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting:: 135 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting::
133 CalcDrawPropsImplInputsForTesting(LayerImpl* root_layer, 136 CalcDrawPropsImplInputsForTesting(LayerImpl* root_layer,
134 const gfx::Size& device_viewport_size, 137 const gfx::Size& device_viewport_size,
135 LayerImplList* render_surface_layer_list) 138 LayerImplList* render_surface_layer_list)
(...skipping 464 matching lines...) Expand 10 before | Expand all | Expand 10 after
600 layer->replica_layer() ? layer->replica_layer()->mask_layer() : nullptr; 603 layer->replica_layer() ? layer->replica_layer()->mask_layer() : nullptr;
601 if (replica_mask_layer) 604 if (replica_mask_layer)
602 ComputeMaskLayerDrawProperties(layer, replica_mask_layer); 605 ComputeMaskLayerDrawProperties(layer, replica_mask_layer);
603 } 606 }
604 607
605 CalculateRenderSurfaceLayerList( 608 CalculateRenderSurfaceLayerList(
606 inputs->root_layer->layer_tree_impl(), inputs->property_trees, 609 inputs->root_layer->layer_tree_impl(), inputs->property_trees,
607 inputs->render_surface_layer_list, inputs->can_render_to_separate_surface, 610 inputs->render_surface_layer_list, inputs->can_render_to_separate_surface,
608 inputs->max_texture_size); 611 inputs->max_texture_size);
609 612
613 if (inputs->verify_clip_tree_calculations)
614 draw_property_utils::VerifyClipTreeCalculations(visible_layer_list,
615 inputs->property_trees);
616
610 if (should_measure_property_tree_performance) { 617 if (should_measure_property_tree_performance) {
611 TRACE_EVENT_END0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), 618 TRACE_EVENT_END0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"),
612 "LayerTreeHostCommon::CalculateDrawProperties"); 619 "LayerTreeHostCommon::CalculateDrawProperties");
613 } 620 }
614 621
615 // A root layer render_surface should always exist after 622 // A root layer render_surface should always exist after
616 // CalculateDrawProperties. 623 // CalculateDrawProperties.
617 DCHECK(inputs->root_layer->render_surface()); 624 DCHECK(inputs->root_layer->render_surface());
618 } 625 }
619 626
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 705
699 PropertyTrees* GetPropertyTrees(Layer* layer) { 706 PropertyTrees* GetPropertyTrees(Layer* layer) {
700 return layer->layer_tree_host()->property_trees(); 707 return layer->layer_tree_host()->property_trees();
701 } 708 }
702 709
703 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { 710 PropertyTrees* GetPropertyTrees(LayerImpl* layer) {
704 return layer->layer_tree_impl()->property_trees(); 711 return layer->layer_tree_impl()->property_trees();
705 } 712 }
706 713
707 } // namespace cc 714 } // namespace cc
OLDNEW
« no previous file with comments | « cc/trees/layer_tree_host_common.h ('k') | cc/trees/layer_tree_host_common_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698