cc: Add main frame timing info to frame timing tracker.

cc/debug/frame_timing_tracker.h

 // Copyright 2015 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.
 
 #ifndef CC_DEBUG_FRAME_TIMING_TRACKER_H_
 #define CC_DEBUG_FRAME_TIMING_TRACKER_H_
 
 #include <utility>
 #include <vector>
 
@@ skipping 14 matching lines @@
     CompositeTimingEvent(int, base::TimeTicks);
     ~CompositeTimingEvent();
 
     int frame_id;
     base::TimeTicks timestamp;
   };
 
   using CompositeTimingSet =
       base::hash_map<int, std::vector<CompositeTimingEvent>>;
 
+  struct CC_EXPORT MainFrameTimingEvent {
+    MainFrameTimingEvent(int frame_id,
+                         base::TimeTicks timestamp,
+                         base::TimeDelta duration);
+    ~MainFrameTimingEvent();
+
+    int frame_id;
+    base::TimeTicks timestamp;
+    base::TimeDelta duration;

[enne (OOO), 2015/02/12 23:41:07]

It's a little weird to have a duration, when you can get that from multiple
timestamps?

[vmpstr, 2015/03/03 18:56:46]

This struct just represents what we would actually send back to the client. I'm
not sure why it's weird :) But I changed it.

+  };
+
+  using MainFrameTimingSet =
+      base::hash_map<int, std::vector<MainFrameTimingEvent>>;
+
   static scoped_ptr<FrameTimingTracker> Create();
 
   ~FrameTimingTracker();
 
   // This routine takes all of the individual CompositeEvents stored in the
   // tracker and collects them by "rect_id", as in the example below.
   // [ {f_id1,r_id1,t1}, {f_id2,r_id1,t2}, {f_id3,r_id2,t3} ]
   // ====>
   // [ {r_id1,<{f_id1,t1},{f_id2,t2}>}, {r_id2,<{f_id3,t3}>} ]
-  scoped_ptr<CompositeTimingSet> GroupCountsByRectId();
+  scoped_ptr<CompositeTimingSet> GroupCompositeCountsByRectId();
+
+  // This routine takes all of the individual MainFrameEvents stored in the
+  // tracker and collects them by "rect_id", as in the example below.
+  scoped_ptr<MainFrameTimingSet> GroupMainFrameCountsByRectId();
 
   // This routine takes a timestamp and an array of frame_id,rect_id pairs
   // and generates CompositeTimingEvents (frame_id, timestamp) and adds them to
   // internal hash_map keyed on rect_id
   using FrameAndRectIds = std::pair<int, int64_t>;
   void SaveTimeStamps(base::TimeTicks timestamp,
                       const std::vector<FrameAndRectIds>& frame_ids);
 
+  void SaveMainFrameTimeStamps(const std::vector<int64_t>& request_ids,
+                               base::TimeTicks main_frame_time,
+                               base::TimeDelta frame_duration,
+                               int source_frame_number);
+
  private:
   FrameTimingTracker();
 
   scoped_ptr<CompositeTimingSet> composite_events_;
+  scoped_ptr<MainFrameTimingSet> main_frame_events_;
 
   DISALLOW_COPY_AND_ASSIGN(FrameTimingTracker);
 };
 
 }  // namespace cc
 
 #endif  // CC_DEBUG_FRAME_TIMING_TRACKER_H_