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

cc/trees/layer_tree_host_unittest.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/layer_tree_host.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/synchronization/lock.h"
@@ skipping 6161 matching lines @@
   void BeginCommitOnThread(LayerTreeHostImpl* host_impl) override {
     if (!check_results_on_commit_)
       return;
 
     // Since in reality, the events will be read by LayerTreeHost during commit,
     // we check the requests here to ensure that they are correct at the next
     // commit time (as opposed to checking in DrawLayers for instance).
     // TODO(vmpstr): Change this to read things from the main thread when this
     // information is propagated to the main thread (not yet implemented).
     FrameTimingTracker* tracker = host_impl->frame_timing_tracker();
-    scoped_ptr<FrameTimingTracker::CompositeTimingSet> timing_set =
-        tracker->GroupCountsByRectId();
-    EXPECT_EQ(1u, timing_set->size());
-    auto rect_1_it = timing_set->find(1);
-    EXPECT_TRUE(rect_1_it != timing_set->end());
-    const auto& timing_events = rect_1_it->second;
-    EXPECT_EQ(1u, timing_events.size());
-    EXPECT_EQ(host_impl->active_tree()->source_frame_number(),
-              timing_events[0].frame_id);
-    EXPECT_GT(timing_events[0].timestamp, base::TimeTicks());
+
+    // Check composite events.
+    {
+      scoped_ptr<FrameTimingTracker::CompositeTimingSet> timing_set =
+          tracker->GroupCompositeCountsByRectId();
+      EXPECT_EQ(1u, timing_set->size());
+      auto rect_1_it = timing_set->find(1);
+      EXPECT_TRUE(rect_1_it != timing_set->end());
+      const auto& timing_events = rect_1_it->second;
+      EXPECT_EQ(1u, timing_events.size());
+      EXPECT_EQ(host_impl->active_tree()->source_frame_number(),
+                timing_events[0].frame_id);
+      EXPECT_GT(timing_events[0].timestamp, base::TimeTicks());
+    }
+
+    // Check main frame events.
+    {
+      scoped_ptr<FrameTimingTracker::MainFrameTimingSet> timing_set =
+          tracker->GroupMainFrameCountsByRectId();
+      EXPECT_EQ(2u, timing_set->size());
+      auto rect_1_it = timing_set->find(1);
+      EXPECT_TRUE(rect_1_it != timing_set->end());
+      const auto& timing_events = rect_1_it->second;
+      EXPECT_EQ(1u, timing_events.size());
+      EXPECT_EQ(host_impl->active_tree()->source_frame_number(),
+                timing_events[0].frame_id);
+      EXPECT_GT(timing_events[0].timestamp, base::TimeTicks());
+      EXPECT_GT(timing_events[0].end_time, timing_events[0].timestamp);
+    }
 
     EndTest();
   }
 
   void DrawLayersOnThread(LayerTreeHostImpl* host_impl) override {
     check_results_on_commit_ = true;
     PostSetNeedsCommitToMainThread();
   }
 
   void AfterTest() override {}
@@ skipping 159 matching lines @@
 
   void AfterTest() override {}
 
  private:
   scoped_refptr<Layer> child_;
 };
 
 SINGLE_AND_MULTI_THREAD_TEST_F(LayerPreserveRenderSurfaceFromOutputRequests);
 
 }  // namespace cc