Pass collected frame timing events to Blink

cc/trees/thread_proxy.cc

 // Copyright 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "cc/trees/thread_proxy.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/auto_reset.h"
@@ skipping 692 matching lines @@
 
   if (!impl().layer_tree_host_impl->settings().impl_side_painting) {
     DCHECK_GT(impl().layer_tree_host_impl->memory_allocation_limit_bytes(), 0u);
   }
   begin_main_frame_state->memory_allocation_limit_bytes =
       impl().layer_tree_host_impl->memory_allocation_limit_bytes();
   begin_main_frame_state->memory_allocation_priority_cutoff =
       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
   impl().last_begin_main_frame_args = begin_main_frame_state->begin_frame_args;
   Proxy::MainThreadTaskRunner()->PostTask(
       FROM_HERE,
       base::Bind(&ThreadProxy::BeginMainFrame,
                  main_thread_weak_ptr_,
                  base::Passed(&begin_main_frame_state)));
   devtools_instrumentation::DidRequestMainThreadFrame(
@@ skipping 61 matching lines @@
   // requests to be scheduled.
   // On the other hand, the animate_requested flag should remain cleared
   // here so that any animation requests generated by the apply or animate
   // callbacks will trigger another frame.
   main().commit_requested = true;
   main().commit_request_sent_to_impl_thread = true;
 
   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 a bit weird to just give a raw
pointer, since we don't know from where what LTH plans to do with it, and as far
as i can tell we don't really want to own the data anymore.

[MikeB, 2015/05/21 21:53:08]

That's how ApplyScrollAndScale does it, and that's what I was basing my change
on. Is your suggestion to just have LTH take a scoped_ptr and thread_proxy calls
.pass?

+
+  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);
   layer_tree_host()->AnimateLayers(
       begin_main_frame_state->begin_frame_args.frame_time);
 
   // Unlink any backings that the impl thread has evicted, so that we know to
   // re-paint them in UpdateLayers.
   if (blocked_main().contents_texture_manager()) {
     blocked_main().contents_texture_manager()->UnlinkAndClearEvictedBackings();
@@ skipping 603 matching lines @@
       FROM_HERE, base::Bind(&ThreadProxy::DidCompletePageScaleAnimation,
                             main_thread_weak_ptr_));
 }
 
 void ThreadProxy::OnDrawForOutputSurface() {
   DCHECK(IsImplThread());
   impl().scheduler->OnDrawForOutputSurface();
 }
 
 }  // namespace cc