| 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/file_util.h" | 9 #include "base/file_util.h" |
| 10 #include "base/files/file_path.h" | 10 #include "base/files/file_path.h" |
| (...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 90 gfx::Transform(), | 90 gfx::Transform(), |
| 91 layer_tree_host()->device_scale_factor(), | 91 layer_tree_host()->device_scale_factor(), |
| 92 layer_tree_host()->page_scale_factor(), | 92 layer_tree_host()->page_scale_factor(), |
| 93 layer_tree_host()->page_scale_layer(), | 93 layer_tree_host()->page_scale_layer(), |
| 94 max_texture_size, | 94 max_texture_size, |
| 95 layer_tree_host()->settings().can_use_lcd_text, | 95 layer_tree_host()->settings().can_use_lcd_text, |
| 96 can_render_to_separate_surface, | 96 can_render_to_separate_surface, |
| 97 layer_tree_host() | 97 layer_tree_host() |
| 98 ->settings() | 98 ->settings() |
| 99 .layer_transforms_should_scale_layer_contents, | 99 .layer_transforms_should_scale_layer_contents, |
| 100 &update_list); | 100 &update_list, |
| 101 0); |
| 101 LayerTreeHostCommon::CalculateDrawProperties(&inputs); | 102 LayerTreeHostCommon::CalculateDrawProperties(&inputs); |
| 102 | 103 |
| 103 timer_.NextLap(); | 104 timer_.NextLap(); |
| 104 } while (!timer_.HasTimeLimitExpired()); | 105 } while (!timer_.HasTimeLimitExpired()); |
| 105 | 106 |
| 106 EndTest(); | 107 EndTest(); |
| 107 } | 108 } |
| 108 }; | 109 }; |
| 109 | 110 |
| 110 class CalcDrawPropsImplTest : public LayerTreeHostCommonPerfTest { | 111 class CalcDrawPropsImplTest : public LayerTreeHostCommonPerfTest { |
| (...skipping 18 matching lines...) Expand all Loading... |
| 129 active_tree->root_layer(), | 130 active_tree->root_layer(), |
| 130 active_tree->DrawViewportSize(), | 131 active_tree->DrawViewportSize(), |
| 131 host_impl->DrawTransform(), | 132 host_impl->DrawTransform(), |
| 132 active_tree->device_scale_factor(), | 133 active_tree->device_scale_factor(), |
| 133 active_tree->total_page_scale_factor(), | 134 active_tree->total_page_scale_factor(), |
| 134 active_tree->InnerViewportContainerLayer(), | 135 active_tree->InnerViewportContainerLayer(), |
| 135 max_texture_size, | 136 max_texture_size, |
| 136 host_impl->settings().can_use_lcd_text, | 137 host_impl->settings().can_use_lcd_text, |
| 137 can_render_to_separate_surface, | 138 can_render_to_separate_surface, |
| 138 host_impl->settings().layer_transforms_should_scale_layer_contents, | 139 host_impl->settings().layer_transforms_should_scale_layer_contents, |
| 139 &update_list); | 140 &update_list, |
| 141 0); |
| 140 LayerTreeHostCommon::CalculateDrawProperties(&inputs); | 142 LayerTreeHostCommon::CalculateDrawProperties(&inputs); |
| 141 | 143 |
| 142 timer_.NextLap(); | 144 timer_.NextLap(); |
| 143 } while (!timer_.HasTimeLimitExpired()); | 145 } while (!timer_.HasTimeLimitExpired()); |
| 144 | 146 |
| 145 EndTest(); | 147 EndTest(); |
| 146 } | 148 } |
| 147 }; | 149 }; |
| 148 | 150 |
| 149 TEST_F(CalcDrawPropsMainTest, TenTen) { | 151 TEST_F(CalcDrawPropsMainTest, TenTen) { |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 189 } | 191 } |
| 190 | 192 |
| 191 TEST_F(CalcDrawPropsImplTest, TouchRegionHeavy) { | 193 TEST_F(CalcDrawPropsImplTest, TouchRegionHeavy) { |
| 192 SetTestName("touch_region_heavy"); | 194 SetTestName("touch_region_heavy"); |
| 193 ReadTestFile("touch_region_heavy"); | 195 ReadTestFile("touch_region_heavy"); |
| 194 RunCalcDrawProps(); | 196 RunCalcDrawProps(); |
| 195 } | 197 } |
| 196 | 198 |
| 197 } // namespace | 199 } // namespace |
| 198 } // namespace cc | 200 } // namespace cc |
| OLD | NEW |