OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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 <stddef.h> | 5 #include <stddef.h> |
6 | 6 |
7 #include <deque> | 7 #include <deque> |
8 #include <memory> | 8 #include <memory> |
9 #include <sstream> | 9 #include <sstream> |
10 | 10 |
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
103 | 103 |
104 EndTest(); | 104 EndTest(); |
105 } | 105 } |
106 | 106 |
107 void DoCalcDrawPropertiesImpl(bool can_render_to_separate_surface, | 107 void DoCalcDrawPropertiesImpl(bool can_render_to_separate_surface, |
108 int max_texture_size, | 108 int max_texture_size, |
109 LayerTreeImpl* active_tree, | 109 LayerTreeImpl* active_tree, |
110 LayerTreeHostImpl* host_impl) { | 110 LayerTreeHostImpl* host_impl) { |
111 RenderSurfaceList update_list; | 111 RenderSurfaceList update_list; |
112 LayerTreeHostCommon::CalcDrawPropsImplInputs inputs( | 112 LayerTreeHostCommon::CalcDrawPropsImplInputs inputs( |
113 active_tree->root_layer_for_testing(), active_tree->DrawViewportSize(), | 113 active_tree->root_layer_for_testing(), |
114 host_impl->DrawTransform(), active_tree->device_scale_factor(), | 114 active_tree->DeviceViewport().size(), host_impl->DrawTransform(), |
| 115 active_tree->device_scale_factor(), |
115 active_tree->current_page_scale_factor(), | 116 active_tree->current_page_scale_factor(), |
116 active_tree->InnerViewportContainerLayer(), | 117 active_tree->InnerViewportContainerLayer(), |
117 active_tree->InnerViewportScrollLayer(), | 118 active_tree->InnerViewportScrollLayer(), |
118 active_tree->OuterViewportScrollLayer(), | 119 active_tree->OuterViewportScrollLayer(), |
119 active_tree->elastic_overscroll()->Current(active_tree->IsActiveTree()), | 120 active_tree->elastic_overscroll()->Current(active_tree->IsActiveTree()), |
120 active_tree->OverscrollElasticityLayer(), max_texture_size, | 121 active_tree->OverscrollElasticityLayer(), max_texture_size, |
121 can_render_to_separate_surface, | 122 can_render_to_separate_surface, |
122 host_impl->settings().layer_transforms_should_scale_layer_contents, | 123 host_impl->settings().layer_transforms_should_scale_layer_contents, |
123 &update_list, active_tree->property_trees()); | 124 &update_list, active_tree->property_trees()); |
124 LayerTreeHostCommon::CalculateDrawProperties(&inputs); | 125 LayerTreeHostCommon::CalculateDrawProperties(&inputs); |
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
182 | 183 |
183 TEST_F(BspTreePerfTest, BspTreeCubes_4) { | 184 TEST_F(BspTreePerfTest, BspTreeCubes_4) { |
184 SetTestName("bsp_tree_cubes_4"); | 185 SetTestName("bsp_tree_cubes_4"); |
185 SetNumberOfDuplicates(4); | 186 SetNumberOfDuplicates(4); |
186 ReadTestFile("layer_sort_cubes"); | 187 ReadTestFile("layer_sort_cubes"); |
187 RunTest(CompositorMode::SINGLE_THREADED); | 188 RunTest(CompositorMode::SINGLE_THREADED); |
188 } | 189 } |
189 | 190 |
190 } // namespace | 191 } // namespace |
191 } // namespace cc | 192 } // namespace cc |
OLD | NEW |