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 <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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
96 timer_.NextLap(); | 96 timer_.NextLap(); |
97 } while (!timer_.HasTimeLimitExpired()); | 97 } while (!timer_.HasTimeLimitExpired()); |
98 | 98 |
99 EndTest(); | 99 EndTest(); |
100 } | 100 } |
101 | 101 |
102 void DoCalcDrawPropertiesImpl(bool can_render_to_separate_surface, | 102 void DoCalcDrawPropertiesImpl(bool can_render_to_separate_surface, |
103 int max_texture_size, | 103 int max_texture_size, |
104 LayerTreeImpl* active_tree, | 104 LayerTreeImpl* active_tree, |
105 LayerTreeHostImpl* host_impl) { | 105 LayerTreeHostImpl* host_impl) { |
106 LayerImplList update_list; | 106 RenderSurfaceList update_list; |
107 LayerTreeHostCommon::CalcDrawPropsImplInputs inputs( | 107 LayerTreeHostCommon::CalcDrawPropsImplInputs inputs( |
108 active_tree->root_layer_for_testing(), active_tree->DrawViewportSize(), | 108 active_tree->root_layer_for_testing(), active_tree->DrawViewportSize(), |
109 host_impl->DrawTransform(), active_tree->device_scale_factor(), | 109 host_impl->DrawTransform(), active_tree->device_scale_factor(), |
110 active_tree->current_page_scale_factor(), | 110 active_tree->current_page_scale_factor(), |
111 active_tree->InnerViewportContainerLayer(), | 111 active_tree->InnerViewportContainerLayer(), |
112 active_tree->InnerViewportScrollLayer(), | 112 active_tree->InnerViewportScrollLayer(), |
113 active_tree->OuterViewportScrollLayer(), | 113 active_tree->OuterViewportScrollLayer(), |
114 active_tree->elastic_overscroll()->Current(active_tree->IsActiveTree()), | 114 active_tree->elastic_overscroll()->Current(active_tree->IsActiveTree()), |
115 active_tree->OverscrollElasticityLayer(), max_texture_size, | 115 active_tree->OverscrollElasticityLayer(), max_texture_size, |
116 can_render_to_separate_surface, | 116 can_render_to_separate_surface, |
(...skipping 22 matching lines...) Expand all Loading... |
139 } | 139 } |
140 | 140 |
141 TEST_F(CalcDrawPropsTest, TouchRegionHeavy) { | 141 TEST_F(CalcDrawPropsTest, TouchRegionHeavy) { |
142 SetTestName("touch_region_heavy"); | 142 SetTestName("touch_region_heavy"); |
143 ReadTestFile("touch_region_heavy"); | 143 ReadTestFile("touch_region_heavy"); |
144 RunCalcDrawProps(); | 144 RunCalcDrawProps(); |
145 } | 145 } |
146 | 146 |
147 } // namespace | 147 } // namespace |
148 } // namespace cc | 148 } // namespace cc |
OLD | NEW |