OLD | NEW |
1 // Copyright 2011 The Chromium Authors. All rights reserved. | 1 // Copyright 2011 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 #ifndef CC_TREES_LAYER_TREE_HOST_COMMON_H_ | 5 #ifndef CC_TREES_LAYER_TREE_HOST_COMMON_H_ |
6 #define CC_TREES_LAYER_TREE_HOST_COMMON_H_ | 6 #define CC_TREES_LAYER_TREE_HOST_COMMON_H_ |
7 | 7 |
8 #include <limits> | 8 #include <limits> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 20 matching lines...) Expand all Loading... |
31 | 31 |
32 template <typename LayerType, typename RenderSurfaceLayerListType> | 32 template <typename LayerType, typename RenderSurfaceLayerListType> |
33 struct CalcDrawPropsInputs { | 33 struct CalcDrawPropsInputs { |
34 public: | 34 public: |
35 CalcDrawPropsInputs(LayerType* root_layer, | 35 CalcDrawPropsInputs(LayerType* root_layer, |
36 const gfx::Size& device_viewport_size, | 36 const gfx::Size& device_viewport_size, |
37 const gfx::Transform& device_transform, | 37 const gfx::Transform& device_transform, |
38 float device_scale_factor, | 38 float device_scale_factor, |
39 float page_scale_factor, | 39 float page_scale_factor, |
40 const LayerType* page_scale_application_layer, | 40 const LayerType* page_scale_application_layer, |
| 41 const gfx::Vector2dF& elastic_overscroll, |
| 42 const LayerType* elastic_overscroll_application_layer, |
41 int max_texture_size, | 43 int max_texture_size, |
42 bool can_use_lcd_text, | 44 bool can_use_lcd_text, |
43 bool layers_always_allowed_lcd_text, | 45 bool layers_always_allowed_lcd_text, |
44 bool can_render_to_separate_surface, | 46 bool can_render_to_separate_surface, |
45 bool can_adjust_raster_scales, | 47 bool can_adjust_raster_scales, |
46 RenderSurfaceLayerListType* render_surface_layer_list, | 48 RenderSurfaceLayerListType* render_surface_layer_list, |
47 int current_render_surface_layer_list_id) | 49 int current_render_surface_layer_list_id) |
48 : root_layer(root_layer), | 50 : root_layer(root_layer), |
49 device_viewport_size(device_viewport_size), | 51 device_viewport_size(device_viewport_size), |
50 device_transform(device_transform), | 52 device_transform(device_transform), |
51 device_scale_factor(device_scale_factor), | 53 device_scale_factor(device_scale_factor), |
52 page_scale_factor(page_scale_factor), | 54 page_scale_factor(page_scale_factor), |
53 page_scale_application_layer(page_scale_application_layer), | 55 page_scale_application_layer(page_scale_application_layer), |
| 56 elastic_overscroll(elastic_overscroll), |
| 57 elastic_overscroll_application_layer( |
| 58 elastic_overscroll_application_layer), |
54 max_texture_size(max_texture_size), | 59 max_texture_size(max_texture_size), |
55 can_use_lcd_text(can_use_lcd_text), | 60 can_use_lcd_text(can_use_lcd_text), |
56 layers_always_allowed_lcd_text(layers_always_allowed_lcd_text), | 61 layers_always_allowed_lcd_text(layers_always_allowed_lcd_text), |
57 can_render_to_separate_surface(can_render_to_separate_surface), | 62 can_render_to_separate_surface(can_render_to_separate_surface), |
58 can_adjust_raster_scales(can_adjust_raster_scales), | 63 can_adjust_raster_scales(can_adjust_raster_scales), |
59 render_surface_layer_list(render_surface_layer_list), | 64 render_surface_layer_list(render_surface_layer_list), |
60 current_render_surface_layer_list_id( | 65 current_render_surface_layer_list_id( |
61 current_render_surface_layer_list_id) {} | 66 current_render_surface_layer_list_id) {} |
62 | 67 |
63 LayerType* root_layer; | 68 LayerType* root_layer; |
64 gfx::Size device_viewport_size; | 69 gfx::Size device_viewport_size; |
65 const gfx::Transform& device_transform; | 70 const gfx::Transform& device_transform; |
66 float device_scale_factor; | 71 float device_scale_factor; |
67 float page_scale_factor; | 72 float page_scale_factor; |
68 const LayerType* page_scale_application_layer; | 73 const LayerType* page_scale_application_layer; |
| 74 gfx::Vector2dF elastic_overscroll; |
| 75 const LayerType* elastic_overscroll_application_layer; |
69 int max_texture_size; | 76 int max_texture_size; |
70 bool can_use_lcd_text; | 77 bool can_use_lcd_text; |
71 bool layers_always_allowed_lcd_text; | 78 bool layers_always_allowed_lcd_text; |
72 bool can_render_to_separate_surface; | 79 bool can_render_to_separate_surface; |
73 bool can_adjust_raster_scales; | 80 bool can_adjust_raster_scales; |
74 RenderSurfaceLayerListType* render_surface_layer_list; | 81 RenderSurfaceLayerListType* render_surface_layer_list; |
75 int current_render_surface_layer_list_id; | 82 int current_render_surface_layer_list_id; |
76 }; | 83 }; |
77 | 84 |
78 template <typename LayerType, typename RenderSurfaceLayerListType> | 85 template <typename LayerType, typename RenderSurfaceLayerListType> |
(...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
138 gfx::Vector2d scroll_delta; | 145 gfx::Vector2d scroll_delta; |
139 }; | 146 }; |
140 }; | 147 }; |
141 | 148 |
142 struct CC_EXPORT ScrollAndScaleSet { | 149 struct CC_EXPORT ScrollAndScaleSet { |
143 ScrollAndScaleSet(); | 150 ScrollAndScaleSet(); |
144 ~ScrollAndScaleSet(); | 151 ~ScrollAndScaleSet(); |
145 | 152 |
146 std::vector<LayerTreeHostCommon::ScrollUpdateInfo> scrolls; | 153 std::vector<LayerTreeHostCommon::ScrollUpdateInfo> scrolls; |
147 float page_scale_delta; | 154 float page_scale_delta; |
| 155 gfx::Vector2dF elastic_overscroll_delta; |
148 float top_controls_delta; | 156 float top_controls_delta; |
149 ScopedPtrVector<SwapPromise> swap_promises; | 157 ScopedPtrVector<SwapPromise> swap_promises; |
150 }; | 158 }; |
151 | 159 |
152 template <typename LayerType> | 160 template <typename LayerType> |
153 bool LayerTreeHostCommon::RenderSurfaceContributesToTarget( | 161 bool LayerTreeHostCommon::RenderSurfaceContributesToTarget( |
154 LayerType* layer, | 162 LayerType* layer, |
155 int target_surface_layer_id) { | 163 int target_surface_layer_id) { |
156 // A layer will either contribute its own content, or its render surface's | 164 // A layer will either contribute its own content, or its render surface's |
157 // content, to the target surface. The layer contributes its surface's content | 165 // content, to the target surface. The layer contributes its surface's content |
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
216 const gfx::Size& device_viewport_size, | 224 const gfx::Size& device_viewport_size, |
217 const gfx::Transform& device_transform, | 225 const gfx::Transform& device_transform, |
218 RenderSurfaceLayerListType* render_surface_layer_list) | 226 RenderSurfaceLayerListType* render_surface_layer_list) |
219 : CalcDrawPropsInputs<LayerType, RenderSurfaceLayerListType>( | 227 : CalcDrawPropsInputs<LayerType, RenderSurfaceLayerListType>( |
220 root_layer, | 228 root_layer, |
221 device_viewport_size, | 229 device_viewport_size, |
222 device_transform, | 230 device_transform, |
223 1.f, | 231 1.f, |
224 1.f, | 232 1.f, |
225 NULL, | 233 NULL, |
| 234 gfx::Vector2dF(), |
| 235 NULL, |
226 std::numeric_limits<int>::max() / 2, | 236 std::numeric_limits<int>::max() / 2, |
227 false, | 237 false, |
228 false, | 238 false, |
229 true, | 239 true, |
230 false, | 240 false, |
231 render_surface_layer_list, | 241 render_surface_layer_list, |
232 0) { | 242 0) { |
233 DCHECK(root_layer); | 243 DCHECK(root_layer); |
234 DCHECK(render_surface_layer_list); | 244 DCHECK(render_surface_layer_list); |
235 } | 245 } |
236 | 246 |
237 template <typename LayerType, typename RenderSurfaceLayerListType> | 247 template <typename LayerType, typename RenderSurfaceLayerListType> |
238 LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType, | 248 LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType, |
239 RenderSurfaceLayerListType>:: | 249 RenderSurfaceLayerListType>:: |
240 CalcDrawPropsInputsForTesting( | 250 CalcDrawPropsInputsForTesting( |
241 LayerType* root_layer, | 251 LayerType* root_layer, |
242 const gfx::Size& device_viewport_size, | 252 const gfx::Size& device_viewport_size, |
243 RenderSurfaceLayerListType* render_surface_layer_list) | 253 RenderSurfaceLayerListType* render_surface_layer_list) |
244 : CalcDrawPropsInputs<LayerType, RenderSurfaceLayerListType>( | 254 : CalcDrawPropsInputs<LayerType, RenderSurfaceLayerListType>( |
245 root_layer, | 255 root_layer, |
246 device_viewport_size, | 256 device_viewport_size, |
247 identity_transform_, | 257 identity_transform_, |
248 1.f, | 258 1.f, |
249 1.f, | 259 1.f, |
250 NULL, | 260 NULL, |
| 261 gfx::Vector2dF(), |
| 262 NULL, |
251 std::numeric_limits<int>::max() / 2, | 263 std::numeric_limits<int>::max() / 2, |
252 false, | 264 false, |
253 false, | 265 false, |
254 true, | 266 true, |
255 false, | 267 false, |
256 render_surface_layer_list, | 268 render_surface_layer_list, |
257 0) { | 269 0) { |
258 DCHECK(root_layer); | 270 DCHECK(root_layer); |
259 DCHECK(render_surface_layer_list); | 271 DCHECK(render_surface_layer_list); |
260 } | 272 } |
261 | 273 |
262 } // namespace cc | 274 } // namespace cc |
263 | 275 |
264 #endif // CC_TREES_LAYER_TREE_HOST_COMMON_H_ | 276 #endif // CC_TREES_LAYER_TREE_HOST_COMMON_H_ |
OLD | NEW |