OLD | NEW |
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 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
74 float page_scale_factor, | 74 float page_scale_factor, |
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_render_to_separate_surface, | 81 bool can_render_to_separate_surface, |
82 bool can_adjust_raster_scales, | 82 bool can_adjust_raster_scales, |
83 bool verify_clip_tree_calculations, | 83 bool verify_clip_tree_calculations, |
| 84 bool verify_transform_tree_calculations, |
84 LayerImplList* render_surface_layer_list, | 85 LayerImplList* render_surface_layer_list, |
85 PropertyTrees* property_trees) | 86 PropertyTrees* property_trees) |
86 : root_layer(root_layer), | 87 : root_layer(root_layer), |
87 device_viewport_size(device_viewport_size), | 88 device_viewport_size(device_viewport_size), |
88 device_transform(device_transform), | 89 device_transform(device_transform), |
89 device_scale_factor(device_scale_factor), | 90 device_scale_factor(device_scale_factor), |
90 page_scale_factor(page_scale_factor), | 91 page_scale_factor(page_scale_factor), |
91 page_scale_layer(page_scale_layer), | 92 page_scale_layer(page_scale_layer), |
92 inner_viewport_scroll_layer(inner_viewport_scroll_layer), | 93 inner_viewport_scroll_layer(inner_viewport_scroll_layer), |
93 outer_viewport_scroll_layer(outer_viewport_scroll_layer), | 94 outer_viewport_scroll_layer(outer_viewport_scroll_layer), |
94 elastic_overscroll(elastic_overscroll), | 95 elastic_overscroll(elastic_overscroll), |
95 elastic_overscroll_application_layer( | 96 elastic_overscroll_application_layer( |
96 elastic_overscroll_application_layer), | 97 elastic_overscroll_application_layer), |
97 max_texture_size(max_texture_size), | 98 max_texture_size(max_texture_size), |
98 can_render_to_separate_surface(can_render_to_separate_surface), | 99 can_render_to_separate_surface(can_render_to_separate_surface), |
99 can_adjust_raster_scales(can_adjust_raster_scales), | 100 can_adjust_raster_scales(can_adjust_raster_scales), |
100 verify_clip_tree_calculations(verify_clip_tree_calculations), | 101 verify_clip_tree_calculations(verify_clip_tree_calculations), |
| 102 verify_transform_tree_calculations(verify_transform_tree_calculations), |
101 render_surface_layer_list(render_surface_layer_list), | 103 render_surface_layer_list(render_surface_layer_list), |
102 property_trees(property_trees) {} | 104 property_trees(property_trees) {} |
103 | 105 |
104 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting:: | 106 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting:: |
105 CalcDrawPropsImplInputsForTesting(LayerImpl* root_layer, | 107 CalcDrawPropsImplInputsForTesting(LayerImpl* root_layer, |
106 const gfx::Size& device_viewport_size, | 108 const gfx::Size& device_viewport_size, |
107 const gfx::Transform& device_transform, | 109 const gfx::Transform& device_transform, |
108 LayerImplList* render_surface_layer_list) | 110 LayerImplList* render_surface_layer_list) |
109 : CalcDrawPropsImplInputs(root_layer, | 111 : CalcDrawPropsImplInputs(root_layer, |
110 device_viewport_size, | 112 device_viewport_size, |
111 device_transform, | 113 device_transform, |
112 1.f, | 114 1.f, |
113 1.f, | 115 1.f, |
114 NULL, | 116 NULL, |
115 NULL, | 117 NULL, |
116 NULL, | 118 NULL, |
117 gfx::Vector2dF(), | 119 gfx::Vector2dF(), |
118 NULL, | 120 NULL, |
119 std::numeric_limits<int>::max() / 2, | 121 std::numeric_limits<int>::max() / 2, |
120 true, | 122 true, |
121 false, | 123 false, |
122 true, | 124 true, |
| 125 true, |
123 render_surface_layer_list, | 126 render_surface_layer_list, |
124 GetPropertyTrees(root_layer)) { | 127 GetPropertyTrees(root_layer)) { |
125 DCHECK(root_layer); | 128 DCHECK(root_layer); |
126 DCHECK(render_surface_layer_list); | 129 DCHECK(render_surface_layer_list); |
127 } | 130 } |
128 | 131 |
129 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting:: | 132 LayerTreeHostCommon::CalcDrawPropsImplInputsForTesting:: |
130 CalcDrawPropsImplInputsForTesting(LayerImpl* root_layer, | 133 CalcDrawPropsImplInputsForTesting(LayerImpl* root_layer, |
131 const gfx::Size& device_viewport_size, | 134 const gfx::Size& device_viewport_size, |
132 LayerImplList* render_surface_layer_list) | 135 LayerImplList* render_surface_layer_list) |
(...skipping 452 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
585 } | 588 } |
586 | 589 |
587 CalculateRenderSurfaceLayerList( | 590 CalculateRenderSurfaceLayerList( |
588 inputs->root_layer->layer_tree_impl(), inputs->property_trees, | 591 inputs->root_layer->layer_tree_impl(), inputs->property_trees, |
589 inputs->render_surface_layer_list, inputs->can_render_to_separate_surface, | 592 inputs->render_surface_layer_list, inputs->can_render_to_separate_surface, |
590 inputs->max_texture_size); | 593 inputs->max_texture_size); |
591 | 594 |
592 if (inputs->verify_clip_tree_calculations) | 595 if (inputs->verify_clip_tree_calculations) |
593 draw_property_utils::VerifyClipTreeCalculations(visible_layer_list, | 596 draw_property_utils::VerifyClipTreeCalculations(visible_layer_list, |
594 inputs->property_trees); | 597 inputs->property_trees); |
| 598 if (inputs->verify_transform_tree_calculations) |
| 599 draw_property_utils::VerifyTransformTreeCalculations( |
| 600 visible_layer_list, inputs->property_trees); |
595 | 601 |
596 if (should_measure_property_tree_performance) { | 602 if (should_measure_property_tree_performance) { |
597 TRACE_EVENT_END0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), | 603 TRACE_EVENT_END0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), |
598 "LayerTreeHostCommon::CalculateDrawProperties"); | 604 "LayerTreeHostCommon::CalculateDrawProperties"); |
599 } | 605 } |
600 | 606 |
601 // A root layer render_surface should always exist after | 607 // A root layer render_surface should always exist after |
602 // CalculateDrawProperties. | 608 // CalculateDrawProperties. |
603 DCHECK(inputs->root_layer->render_surface()); | 609 DCHECK(inputs->root_layer->render_surface()); |
604 } | 610 } |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
684 | 690 |
685 PropertyTrees* GetPropertyTrees(Layer* layer) { | 691 PropertyTrees* GetPropertyTrees(Layer* layer) { |
686 return layer->layer_tree_host()->property_trees(); | 692 return layer->layer_tree_host()->property_trees(); |
687 } | 693 } |
688 | 694 |
689 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { | 695 PropertyTrees* GetPropertyTrees(LayerImpl* layer) { |
690 return layer->layer_tree_impl()->property_trees(); | 696 return layer->layer_tree_impl()->property_trees(); |
691 } | 697 } |
692 | 698 |
693 } // namespace cc | 699 } // namespace cc |
OLD | NEW |