Index: cc/trees/thread_proxy.cc |
diff --git a/cc/trees/thread_proxy.cc b/cc/trees/thread_proxy.cc |
index 3010fba95c32165329df0ad5ea7a3d56d8c2a879..4b3cab2df074e175ffcf97987e9472aecb5af068 100644 |
--- a/cc/trees/thread_proxy.cc |
+++ b/cc/trees/thread_proxy.cc |
@@ -710,6 +710,14 @@ void ThreadProxy::ScheduledActionSendBeginMainFrame() { |
impl().layer_tree_host_impl->memory_allocation_priority_cutoff(); |
begin_main_frame_state->evicted_ui_resources = |
impl().layer_tree_host_impl->EvictedUIResourcesExist(); |
+ begin_main_frame_state->frame_composite_counts = |
+ impl() |
+ .layer_tree_host_impl->frame_timing_tracker() |
+ ->GroupCompositeCountsByRectId(); |
+ begin_main_frame_state->frame_render_counts = |
+ impl() |
+ .layer_tree_host_impl->frame_timing_tracker() |
+ ->GroupMainFrameCountsByRectId(); |
// TODO(vmpstr): This needs to be fixed if |
// main_frame_before_activation_enabled is set, since we might run this code |
// twice before recording a duration. crbug.com/469824 |
@@ -791,6 +799,12 @@ void ThreadProxy::BeginMainFrame( |
layer_tree_host()->ApplyScrollAndScale( |
begin_main_frame_state->scroll_info.get()); |
+ layer_tree_host()->RecordCompositeTimings( |
+ begin_main_frame_state->frame_composite_counts.get()); |
vmpstr
2015/05/12 23:48:25
Should we be passing ownership here instead? It's
MikeB
2015/05/21 21:53:08
That's how ApplyScrollAndScale does it, and that's
|
+ |
+ layer_tree_host()->RecordRenderTimings( |
+ begin_main_frame_state->frame_render_counts.get()); |
+ |
layer_tree_host()->WillBeginMainFrame(); |
layer_tree_host()->BeginMainFrame(begin_main_frame_state->begin_frame_args); |