OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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 <sstream> | 7 #include <sstream> |
8 | 8 |
9 #include "base/files/file_path.h" | 9 #include "base/files/file_path.h" |
10 #include "base/files/file_util.h" | 10 #include "base/files/file_util.h" |
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
98 layer_tree_host()->page_scale_factor(), | 98 layer_tree_host()->page_scale_factor(), |
99 layer_tree_host()->overscroll_elasticity_layer(), | 99 layer_tree_host()->overscroll_elasticity_layer(), |
100 layer_tree_host()->elastic_overscroll(), | 100 layer_tree_host()->elastic_overscroll(), |
101 layer_tree_host()->page_scale_layer(), max_texture_size, | 101 layer_tree_host()->page_scale_layer(), max_texture_size, |
102 layer_tree_host()->settings().can_use_lcd_text, | 102 layer_tree_host()->settings().can_use_lcd_text, |
103 layer_tree_host()->settings().layers_always_allowed_lcd_text, | 103 layer_tree_host()->settings().layers_always_allowed_lcd_text, |
104 can_render_to_separate_surface, | 104 can_render_to_separate_surface, |
105 layer_tree_host() | 105 layer_tree_host() |
106 ->settings() | 106 ->settings() |
107 .layer_transforms_should_scale_layer_contents, | 107 .layer_transforms_should_scale_layer_contents, |
| 108 layer_tree_host()->settings().verify_property_trees, |
108 &update_list, 0); | 109 &update_list, 0); |
109 LayerTreeHostCommon::CalculateDrawProperties(&inputs); | 110 LayerTreeHostCommon::CalculateDrawProperties(&inputs); |
110 | 111 |
111 timer_.NextLap(); | 112 timer_.NextLap(); |
112 } while (!timer_.HasTimeLimitExpired()); | 113 } while (!timer_.HasTimeLimitExpired()); |
113 | 114 |
114 EndTest(); | 115 EndTest(); |
115 } | 116 } |
116 }; | 117 }; |
117 | 118 |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
150 active_tree->root_layer(), active_tree->DrawViewportSize(), | 151 active_tree->root_layer(), active_tree->DrawViewportSize(), |
151 host_impl->DrawTransform(), active_tree->device_scale_factor(), | 152 host_impl->DrawTransform(), active_tree->device_scale_factor(), |
152 active_tree->current_page_scale_factor(), | 153 active_tree->current_page_scale_factor(), |
153 active_tree->InnerViewportContainerLayer(), | 154 active_tree->InnerViewportContainerLayer(), |
154 active_tree->elastic_overscroll()->Current(active_tree->IsActiveTree()), | 155 active_tree->elastic_overscroll()->Current(active_tree->IsActiveTree()), |
155 active_tree->overscroll_elasticity_layer(), max_texture_size, | 156 active_tree->overscroll_elasticity_layer(), max_texture_size, |
156 host_impl->settings().can_use_lcd_text, | 157 host_impl->settings().can_use_lcd_text, |
157 host_impl->settings().layers_always_allowed_lcd_text, | 158 host_impl->settings().layers_always_allowed_lcd_text, |
158 can_render_to_separate_surface, | 159 can_render_to_separate_surface, |
159 host_impl->settings().layer_transforms_should_scale_layer_contents, | 160 host_impl->settings().layer_transforms_should_scale_layer_contents, |
| 161 host_impl->settings().verify_property_trees, |
160 &update_list, 0); | 162 &update_list, 0); |
161 LayerTreeHostCommon::CalculateDrawProperties(&inputs); | 163 LayerTreeHostCommon::CalculateDrawProperties(&inputs); |
162 } | 164 } |
163 }; | 165 }; |
164 | 166 |
165 class LayerSorterMainTest : public CalcDrawPropsImplTest { | 167 class LayerSorterMainTest : public CalcDrawPropsImplTest { |
166 public: | 168 public: |
167 void RunSortLayers() { RunTest(false, false, false); } | 169 void RunSortLayers() { RunTest(false, false, false); } |
168 | 170 |
169 void BeginTest() override { PostSetNeedsCommitToMainThread(); } | 171 void BeginTest() override { PostSetNeedsCommitToMainThread(); } |
(...skipping 178 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
348 | 350 |
349 TEST_F(BspTreePerfTest, BspTreeCubes_4) { | 351 TEST_F(BspTreePerfTest, BspTreeCubes_4) { |
350 SetTestName("bsp_tree_cubes_4"); | 352 SetTestName("bsp_tree_cubes_4"); |
351 SetNumberOfDuplicates(4); | 353 SetNumberOfDuplicates(4); |
352 ReadTestFile("layer_sort_cubes"); | 354 ReadTestFile("layer_sort_cubes"); |
353 RunSortLayers(); | 355 RunSortLayers(); |
354 } | 356 } |
355 | 357 |
356 } // namespace | 358 } // namespace |
357 } // namespace cc | 359 } // namespace cc |
OLD | NEW |