| Index: cc/trees/layer_tree_host_common.h
|
| diff --git a/cc/trees/layer_tree_host_common.h b/cc/trees/layer_tree_host_common.h
|
| index de9a713ccb6b0f44488490c4d1f1d30e23104f6d..5090c6977e02a4d4c1ed85156c2f74f6f023b860 100644
|
| --- a/cc/trees/layer_tree_host_common.h
|
| +++ b/cc/trees/layer_tree_host_common.h
|
| @@ -41,7 +41,8 @@ class CC_EXPORT LayerTreeHostCommon {
|
| bool can_use_lcd_text,
|
| bool can_render_to_separate_surface,
|
| bool can_adjust_raster_scales,
|
| - RenderSurfaceLayerListType* render_surface_layer_list)
|
| + RenderSurfaceLayerListType* render_surface_layer_list,
|
| + int current_render_surface_layer_list_id)
|
| : root_layer(root_layer),
|
| device_viewport_size(device_viewport_size),
|
| device_transform(device_transform),
|
| @@ -52,7 +53,9 @@ class CC_EXPORT LayerTreeHostCommon {
|
| can_use_lcd_text(can_use_lcd_text),
|
| can_render_to_separate_surface(can_render_to_separate_surface),
|
| can_adjust_raster_scales(can_adjust_raster_scales),
|
| - render_surface_layer_list(render_surface_layer_list) {}
|
| + render_surface_layer_list(render_surface_layer_list),
|
| + current_render_surface_layer_list_id(
|
| + current_render_surface_layer_list_id) {}
|
|
|
| LayerType* root_layer;
|
| gfx::Size device_viewport_size;
|
| @@ -65,6 +68,7 @@ class CC_EXPORT LayerTreeHostCommon {
|
| bool can_render_to_separate_surface;
|
| bool can_adjust_raster_scales;
|
| RenderSurfaceLayerListType* render_surface_layer_list;
|
| + int current_render_surface_layer_list_id;
|
| };
|
|
|
| template <typename LayerType, typename RenderSurfaceLayerListType>
|
| @@ -233,7 +237,8 @@ LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType,
|
| false,
|
| true,
|
| false,
|
| - render_surface_layer_list) {
|
| + render_surface_layer_list,
|
| + 0) {
|
| DCHECK(root_layer);
|
| DCHECK(render_surface_layer_list);
|
| }
|
| @@ -256,7 +261,8 @@ LayerTreeHostCommon::CalcDrawPropsInputsForTesting<LayerType,
|
| false,
|
| true,
|
| false,
|
| - render_surface_layer_list) {
|
| + render_surface_layer_list,
|
| + 0) {
|
| DCHECK(root_layer);
|
| DCHECK(render_surface_layer_list);
|
| }
|
|
|