Chromium Code Reviews| Index: cc/trees/layer_tree_host_common.cc |
| diff --git a/cc/trees/layer_tree_host_common.cc b/cc/trees/layer_tree_host_common.cc |
| index 308820758d1d78df245ddb945b56fc599c9a6939..7b46153ab11374304b6dd91a15dc4b57d400fb25 100644 |
| --- a/cc/trees/layer_tree_host_common.cc |
| +++ b/cc/trees/layer_tree_host_common.cc |
| @@ -2506,14 +2506,15 @@ void LayerTreeHostCommon::CalculateDrawProperties( |
| PreCalculateMetaInformationRecursiveData recursive_data; |
| PreCalculateMetaInformation(inputs->root_layer, &recursive_data); |
| std::vector<AccumulatedSurfaceState<Layer>> accumulated_surface_state; |
| - CalculateDrawPropertiesInternal<Layer>( |
| - inputs->root_layer, |
| - globals, |
| - data_for_recursion, |
| - inputs->render_surface_layer_list, |
| - &dummy_layer_list, |
| - &accumulated_surface_state, |
| - inputs->current_render_surface_layer_list_id); |
| + { |
| + TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), |
|
enne (OOO)
2015/02/17 17:40:14
You should include the precalculate meta-informati
Ian Vollick
2015/02/18 05:22:43
Done.
|
| + "LayerTreeHostCommon::CalculateDrawProperties"); |
| + CalculateDrawPropertiesInternal<Layer>( |
| + inputs->root_layer, globals, data_for_recursion, |
| + inputs->render_surface_layer_list, &dummy_layer_list, |
| + &accumulated_surface_state, |
| + inputs->current_render_surface_layer_list_id); |
| + } |
| // The dummy layer list should not have been used. |
| DCHECK_EQ(0u, dummy_layer_list.size()); |
| @@ -2526,11 +2527,15 @@ void LayerTreeHostCommon::CalculateDrawProperties( |
| // will eventually get these data passed directly to the compositor. |
| TransformTree transform_tree; |
| ClipTree clip_tree; |
| - ComputeVisibleRectsUsingPropertyTrees( |
| - inputs->root_layer, inputs->page_scale_application_layer, |
| - inputs->page_scale_factor, inputs->device_scale_factor, |
| - gfx::Rect(inputs->device_viewport_size), inputs->device_transform, |
| - &transform_tree, &clip_tree); |
| + { |
| + TRACE_EVENT0(TRACE_DISABLED_BY_DEFAULT("cc.debug.cdp-perf"), |
| + "LayerTreeHostCommon::ComputeVisibleRectsWithPropertyTrees"); |
| + ComputeVisibleRectsUsingPropertyTrees( |
| + inputs->root_layer, inputs->page_scale_application_layer, |
| + inputs->page_scale_factor, inputs->device_scale_factor, |
| + gfx::Rect(inputs->device_viewport_size), inputs->device_transform, |
| + &transform_tree, &clip_tree); |
| + } |
| LayerIterator<Layer> it, end; |
| for (it = LayerIterator<Layer>::Begin(inputs->render_surface_layer_list), |