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 23 matching lines...) Expand all Loading... | |
34 CalcDrawPropsInputs(LayerType* root_layer, | 34 CalcDrawPropsInputs(LayerType* root_layer, |
35 const gfx::Size& device_viewport_size, | 35 const gfx::Size& device_viewport_size, |
36 const gfx::Transform& device_transform, | 36 const gfx::Transform& device_transform, |
37 float device_scale_factor, | 37 float device_scale_factor, |
38 float page_scale_factor, | 38 float page_scale_factor, |
39 const LayerType* page_scale_application_layer, | 39 const LayerType* page_scale_application_layer, |
40 int max_texture_size, | 40 int max_texture_size, |
41 bool can_use_lcd_text, | 41 bool can_use_lcd_text, |
42 bool can_render_to_separate_surface, | 42 bool can_render_to_separate_surface, |
43 bool can_adjust_raster_scales, | 43 bool can_adjust_raster_scales, |
44 RenderSurfaceLayerListType* render_surface_layer_list) | 44 RenderSurfaceLayerListType* render_surface_layer_list, |
45 size_t current_calculate_draw_properties_count) | |
45 : root_layer(root_layer), | 46 : root_layer(root_layer), |
46 device_viewport_size(device_viewport_size), | 47 device_viewport_size(device_viewport_size), |
47 device_transform(device_transform), | 48 device_transform(device_transform), |
48 device_scale_factor(device_scale_factor), | 49 device_scale_factor(device_scale_factor), |
49 page_scale_factor(page_scale_factor), | 50 page_scale_factor(page_scale_factor), |
50 page_scale_application_layer(page_scale_application_layer), | 51 page_scale_application_layer(page_scale_application_layer), |
51 max_texture_size(max_texture_size), | 52 max_texture_size(max_texture_size), |
52 can_use_lcd_text(can_use_lcd_text), | 53 can_use_lcd_text(can_use_lcd_text), |
53 can_render_to_separate_surface(can_render_to_separate_surface), | 54 can_render_to_separate_surface(can_render_to_separate_surface), |
54 can_adjust_raster_scales(can_adjust_raster_scales), | 55 can_adjust_raster_scales(can_adjust_raster_scales), |
55 render_surface_layer_list(render_surface_layer_list) {} | 56 render_surface_layer_list(render_surface_layer_list), |
57 current_calculate_draw_properties_count( | |
58 current_calculate_draw_properties_count) {} | |
56 | 59 |
57 LayerType* root_layer; | 60 LayerType* root_layer; |
58 gfx::Size device_viewport_size; | 61 gfx::Size device_viewport_size; |
59 const gfx::Transform& device_transform; | 62 const gfx::Transform& device_transform; |
60 float device_scale_factor; | 63 float device_scale_factor; |
61 float page_scale_factor; | 64 float page_scale_factor; |
62 const LayerType* page_scale_application_layer; | 65 const LayerType* page_scale_application_layer; |
63 int max_texture_size; | 66 int max_texture_size; |
64 bool can_use_lcd_text; | 67 bool can_use_lcd_text; |
65 bool can_render_to_separate_surface; | 68 bool can_render_to_separate_surface; |
66 bool can_adjust_raster_scales; | 69 bool can_adjust_raster_scales; |
67 RenderSurfaceLayerListType* render_surface_layer_list; | 70 RenderSurfaceLayerListType* render_surface_layer_list; |
71 size_t current_calculate_draw_properties_count; | |
enne (OOO)
2014/05/02 23:47:53
I think I would prefer using SourceFrameNumber her
vmpstr
2014/05/05 18:46:43
I would still prefer to have an independent count
| |
68 }; | 72 }; |
69 | 73 |
70 template <typename LayerType, typename RenderSurfaceLayerListType> | 74 template <typename LayerType, typename RenderSurfaceLayerListType> |
71 struct CalcDrawPropsInputsForTesting | 75 struct CalcDrawPropsInputsForTesting |
72 : public CalcDrawPropsInputs<LayerType, RenderSurfaceLayerListType> { | 76 : public CalcDrawPropsInputs<LayerType, RenderSurfaceLayerListType> { |
73 CalcDrawPropsInputsForTesting( | 77 CalcDrawPropsInputsForTesting( |
74 LayerType* root_layer, | 78 LayerType* root_layer, |
75 const gfx::Size& device_viewport_size, | 79 const gfx::Size& device_viewport_size, |
76 const gfx::Transform& device_transform, | 80 const gfx::Transform& device_transform, |
77 RenderSurfaceLayerListType* render_surface_layer_list); | 81 RenderSurfaceLayerListType* render_surface_layer_list); |
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
257 true, | 261 true, |
258 false, | 262 false, |
259 render_surface_layer_list) { | 263 render_surface_layer_list) { |
260 DCHECK(root_layer); | 264 DCHECK(root_layer); |
261 DCHECK(render_surface_layer_list); | 265 DCHECK(render_surface_layer_list); |
262 } | 266 } |
263 | 267 |
264 } // namespace cc | 268 } // namespace cc |
265 | 269 |
266 #endif // CC_TREES_LAYER_TREE_HOST_COMMON_H_ | 270 #endif // CC_TREES_LAYER_TREE_HOST_COMMON_H_ |
OLD | NEW |