| 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 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 82 void RunCalcDrawProps() { RunTest(false, false, false); } | 82 void RunCalcDrawProps() { RunTest(false, false, false); } |
| 83 | 83 |
| 84 void BeginTest() override { | 84 void BeginTest() override { |
| 85 timer_.Reset(); | 85 timer_.Reset(); |
| 86 | 86 |
| 87 do { | 87 do { |
| 88 bool can_render_to_separate_surface = true; | 88 bool can_render_to_separate_surface = true; |
| 89 bool verify_property_trees = false; | 89 bool verify_property_trees = false; |
| 90 int max_texture_size = 8096; | 90 int max_texture_size = 8096; |
| 91 RenderSurfaceLayerList update_list; | 91 RenderSurfaceLayerList update_list; |
| 92 PropertyTrees property_trees; |
| 92 LayerTreeHostCommon::CalcDrawPropsMainInputs inputs( | 93 LayerTreeHostCommon::CalcDrawPropsMainInputs inputs( |
| 93 layer_tree_host()->root_layer(), | 94 layer_tree_host()->root_layer(), |
| 94 layer_tree_host()->device_viewport_size(), gfx::Transform(), | 95 layer_tree_host()->device_viewport_size(), gfx::Transform(), |
| 95 layer_tree_host()->device_scale_factor(), | 96 layer_tree_host()->device_scale_factor(), |
| 96 layer_tree_host()->page_scale_factor(), | 97 layer_tree_host()->page_scale_factor(), |
| 97 layer_tree_host()->overscroll_elasticity_layer(), | 98 layer_tree_host()->overscroll_elasticity_layer(), |
| 98 layer_tree_host()->elastic_overscroll(), | 99 layer_tree_host()->elastic_overscroll(), |
| 99 layer_tree_host()->page_scale_layer(), max_texture_size, | 100 layer_tree_host()->page_scale_layer(), max_texture_size, |
| 100 layer_tree_host()->settings().can_use_lcd_text, | 101 layer_tree_host()->settings().can_use_lcd_text, |
| 101 layer_tree_host()->settings().layers_always_allowed_lcd_text, | 102 layer_tree_host()->settings().layers_always_allowed_lcd_text, |
| 102 can_render_to_separate_surface, | 103 can_render_to_separate_surface, |
| 103 layer_tree_host() | 104 layer_tree_host() |
| 104 ->settings() | 105 ->settings() |
| 105 .layer_transforms_should_scale_layer_contents, | 106 .layer_transforms_should_scale_layer_contents, |
| 106 verify_property_trees, &update_list, 0); | 107 verify_property_trees, &update_list, 0, &property_trees); |
| 107 LayerTreeHostCommon::CalculateDrawProperties(&inputs); | 108 LayerTreeHostCommon::CalculateDrawProperties(&inputs); |
| 108 | 109 |
| 109 timer_.NextLap(); | 110 timer_.NextLap(); |
| 110 } while (!timer_.HasTimeLimitExpired()); | 111 } while (!timer_.HasTimeLimitExpired()); |
| 111 | 112 |
| 112 EndTest(); | 113 EndTest(); |
| 113 } | 114 } |
| 114 }; | 115 }; |
| 115 | 116 |
| 116 class CalcDrawPropsImplTest : public LayerTreeHostCommonPerfTest { | 117 class CalcDrawPropsImplTest : public LayerTreeHostCommonPerfTest { |
| (...skipping 20 matching lines...) Expand all Loading... |
| 137 } while (!timer_.HasTimeLimitExpired()); | 138 } while (!timer_.HasTimeLimitExpired()); |
| 138 | 139 |
| 139 EndTest(); | 140 EndTest(); |
| 140 } | 141 } |
| 141 | 142 |
| 142 void DoCalcDrawPropertiesImpl(bool can_render_to_separate_surface, | 143 void DoCalcDrawPropertiesImpl(bool can_render_to_separate_surface, |
| 143 int max_texture_size, | 144 int max_texture_size, |
| 144 LayerTreeImpl* active_tree, | 145 LayerTreeImpl* active_tree, |
| 145 LayerTreeHostImpl* host_impl) { | 146 LayerTreeHostImpl* host_impl) { |
| 146 LayerImplList update_list; | 147 LayerImplList update_list; |
| 148 PropertyTrees property_trees; |
| 147 bool verify_property_trees = false; | 149 bool verify_property_trees = false; |
| 148 LayerTreeHostCommon::CalcDrawPropsImplInputs inputs( | 150 LayerTreeHostCommon::CalcDrawPropsImplInputs inputs( |
| 149 active_tree->root_layer(), active_tree->DrawViewportSize(), | 151 active_tree->root_layer(), active_tree->DrawViewportSize(), |
| 150 host_impl->DrawTransform(), active_tree->device_scale_factor(), | 152 host_impl->DrawTransform(), active_tree->device_scale_factor(), |
| 151 active_tree->current_page_scale_factor(), | 153 active_tree->current_page_scale_factor(), |
| 152 active_tree->InnerViewportContainerLayer(), | 154 active_tree->InnerViewportContainerLayer(), |
| 153 active_tree->elastic_overscroll()->Current(active_tree->IsActiveTree()), | 155 active_tree->elastic_overscroll()->Current(active_tree->IsActiveTree()), |
| 154 active_tree->overscroll_elasticity_layer(), max_texture_size, | 156 active_tree->overscroll_elasticity_layer(), max_texture_size, |
| 155 host_impl->settings().can_use_lcd_text, | 157 host_impl->settings().can_use_lcd_text, |
| 156 host_impl->settings().layers_always_allowed_lcd_text, | 158 host_impl->settings().layers_always_allowed_lcd_text, |
| 157 can_render_to_separate_surface, | 159 can_render_to_separate_surface, |
| 158 host_impl->settings().layer_transforms_should_scale_layer_contents, | 160 host_impl->settings().layer_transforms_should_scale_layer_contents, |
| 159 verify_property_trees, &update_list, 0); | 161 verify_property_trees, &update_list, 0, &property_trees); |
| 160 LayerTreeHostCommon::CalculateDrawProperties(&inputs); | 162 LayerTreeHostCommon::CalculateDrawProperties(&inputs); |
| 161 } | 163 } |
| 162 }; | 164 }; |
| 163 | 165 |
| 164 class BspTreePerfTest : public CalcDrawPropsImplTest { | 166 class BspTreePerfTest : public CalcDrawPropsImplTest { |
| 165 public: | 167 public: |
| 166 BspTreePerfTest() : num_duplicates_(1) {} | 168 BspTreePerfTest() : num_duplicates_(1) {} |
| 167 void RunSortLayers() { RunTest(false, false, false); } | 169 void RunSortLayers() { RunTest(false, false, false); } |
| 168 | 170 |
| 169 void SetNumberOfDuplicates(int num_duplicates) { | 171 void SetNumberOfDuplicates(int num_duplicates) { |
| (...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 321 | 323 |
| 322 TEST_F(BspTreePerfTest, BspTreeCubes_4) { | 324 TEST_F(BspTreePerfTest, BspTreeCubes_4) { |
| 323 SetTestName("bsp_tree_cubes_4"); | 325 SetTestName("bsp_tree_cubes_4"); |
| 324 SetNumberOfDuplicates(4); | 326 SetNumberOfDuplicates(4); |
| 325 ReadTestFile("layer_sort_cubes"); | 327 ReadTestFile("layer_sort_cubes"); |
| 326 RunSortLayers(); | 328 RunSortLayers(); |
| 327 } | 329 } |
| 328 | 330 |
| 329 } // namespace | 331 } // namespace |
| 330 } // namespace cc | 332 } // namespace cc |
| OLD | NEW |