cc: Add MainAndImplFrameTimeDelta UMA.

cc/scheduler/compositor_timing_history_unittest.cc

 // 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.
 
 #include "cc/scheduler/compositor_timing_history.h"
 
 #include "base/macros.h"
 #include "cc/debug/rendering_stats_instrumentation.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace cc {
 namespace {
 
 class CompositorTimingHistoryTest;
 
 class TestCompositorTimingHistory : public CompositorTimingHistory {
  public:
   TestCompositorTimingHistory(CompositorTimingHistoryTest* test,
                               RenderingStatsInstrumentation* rendering_stats)
-      : CompositorTimingHistory(NULL_UMA, rendering_stats), test_(test) {}
+      : CompositorTimingHistory(false, NULL_UMA, rendering_stats),
+        test_(test) {}
 
  protected:
   base::TimeTicks Now() const override;
 
   CompositorTimingHistoryTest* test_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TestCompositorTimingHistory);
 };
 
@@ skipping 30 matching lines @@
   base::TimeDelta begin_main_frame_start_to_commit_duration =
       base::TimeDelta::FromMilliseconds(1);
   base::TimeDelta prepare_tiles_duration = base::TimeDelta::FromMilliseconds(2);
   base::TimeDelta prepare_tiles_end_to_ready_to_activate_duration =
       base::TimeDelta::FromMilliseconds(1);
   base::TimeDelta commit_to_ready_to_activate_duration =
       base::TimeDelta::FromMilliseconds(3);
   base::TimeDelta activate_duration = base::TimeDelta::FromMilliseconds(4);
   base::TimeDelta draw_duration = base::TimeDelta::FromMilliseconds(5);
 
-  timing_history_.WillBeginMainFrame(true);
+  timing_history_.WillBeginMainFrame(true, Now());
   AdvanceNowBy(begin_main_frame_queue_duration);
   timing_history_.BeginMainFrameStarted(Now());
   AdvanceNowBy(begin_main_frame_start_to_commit_duration);
   timing_history_.DidCommit();
   timing_history_.WillPrepareTiles();
   AdvanceNowBy(prepare_tiles_duration);
   timing_history_.DidPrepareTiles();
   AdvanceNowBy(prepare_tiles_end_to_ready_to_activate_duration);
   timing_history_.ReadyToActivate();
   // Do not count idle time between notification and actual activation.
   AdvanceNowBy(one_second);
   timing_history_.WillActivate();
   AdvanceNowBy(activate_duration);
   timing_history_.DidActivate();
   // Do not count idle time between activate and draw.
   AdvanceNowBy(one_second);
   timing_history_.WillDraw();
   AdvanceNowBy(draw_duration);
-  timing_history_.DidDraw(true);
+  timing_history_.DidDraw(true, true, Now());
 
   EXPECT_EQ(begin_main_frame_queue_duration,
             timing_history_.BeginMainFrameQueueDurationCriticalEstimate());
   EXPECT_EQ(begin_main_frame_queue_duration,
             timing_history_.BeginMainFrameQueueDurationNotCriticalEstimate());
 
   EXPECT_EQ(begin_main_frame_start_to_commit_duration,
             timing_history_.BeginMainFrameStartToCommitDurationEstimate());
 
   base::TimeDelta begin_main_frame_to_commit_duration_expected_ =
@@ skipping 18 matching lines @@
   base::TimeDelta begin_main_frame_start_to_commit_duration =
       base::TimeDelta::FromMilliseconds(1);
   base::TimeDelta prepare_tiles_duration = base::TimeDelta::FromMilliseconds(2);
   base::TimeDelta prepare_tiles_end_to_ready_to_activate_duration =
       base::TimeDelta::FromMilliseconds(1);
   base::TimeDelta commit_to_ready_to_activate_duration =
       base::TimeDelta::FromMilliseconds(3);
   base::TimeDelta activate_duration = base::TimeDelta::FromMilliseconds(4);
   base::TimeDelta draw_duration = base::TimeDelta::FromMilliseconds(5);
 
-  timing_history_.WillBeginMainFrame(true);
+  timing_history_.WillBeginMainFrame(false, Now());
   AdvanceNowBy(begin_main_frame_queue_duration);
   timing_history_.BeginMainFrameStarted(Now());
   AdvanceNowBy(begin_main_frame_start_to_commit_duration);
   // BeginMainFrameAborted counts as a commit complete.
   timing_history_.BeginMainFrameAborted();
   timing_history_.WillPrepareTiles();
   AdvanceNowBy(prepare_tiles_duration);
   timing_history_.DidPrepareTiles();
   AdvanceNowBy(prepare_tiles_end_to_ready_to_activate_duration);
   timing_history_.ReadyToActivate();
   // Do not count idle time between notification and actual activation.
   AdvanceNowBy(one_second);
   timing_history_.WillActivate();
   AdvanceNowBy(activate_duration);
   timing_history_.DidActivate();
   // Do not count idle time between activate and draw.
   AdvanceNowBy(one_second);
   timing_history_.WillDraw();
   AdvanceNowBy(draw_duration);
-  timing_history_.DidDraw(true);
+  timing_history_.DidDraw(false, false, Now());
 
-  EXPECT_EQ(begin_main_frame_queue_duration,
+  EXPECT_EQ(base::TimeDelta(),
             timing_history_.BeginMainFrameQueueDurationCriticalEstimate());
   EXPECT_EQ(begin_main_frame_queue_duration,
             timing_history_.BeginMainFrameQueueDurationNotCriticalEstimate());
 
   EXPECT_EQ(begin_main_frame_start_to_commit_duration,
             timing_history_.BeginMainFrameStartToCommitDurationEstimate());
 
   base::TimeDelta begin_main_frame_to_commit_duration_expected_ =
       begin_main_frame_queue_duration +
       begin_main_frame_start_to_commit_duration;
@@ skipping 10 matching lines @@
 
 TEST_F(CompositorTimingHistoryTest, BeginMainFrame_CriticalFaster) {
   // Critical BeginMainFrames are faster than non critical ones.
   base::TimeDelta begin_main_frame_queue_duration_critical =
       base::TimeDelta::FromMilliseconds(1);
   base::TimeDelta begin_main_frame_queue_duration_not_critical =
       base::TimeDelta::FromMilliseconds(2);
   base::TimeDelta begin_main_frame_start_to_commit_duration =
       base::TimeDelta::FromMilliseconds(1);
 
-  timing_history_.WillBeginMainFrame(true);
+  timing_history_.WillBeginMainFrame(true, Now());
   AdvanceNowBy(begin_main_frame_queue_duration_critical);
   timing_history_.BeginMainFrameStarted(Now());
   AdvanceNowBy(begin_main_frame_start_to_commit_duration);
   timing_history_.BeginMainFrameAborted();
 
-  timing_history_.WillBeginMainFrame(false);
+  timing_history_.WillBeginMainFrame(false, Now());
   AdvanceNowBy(begin_main_frame_queue_duration_not_critical);
   timing_history_.BeginMainFrameStarted(Now());
   AdvanceNowBy(begin_main_frame_start_to_commit_duration);
   timing_history_.BeginMainFrameAborted();
 
   // Since the critical BeginMainFrames are faster than non critical ones,
   // the expectations are straightforward.
   EXPECT_EQ(begin_main_frame_queue_duration_critical,
             timing_history_.BeginMainFrameQueueDurationCriticalEstimate());
   EXPECT_EQ(begin_main_frame_queue_duration_not_critical,
@@ skipping 13 matching lines @@
   // which is unexpected, but could occur if one type of frame
   // hasn't been sent for a significant amount of time.
   base::TimeDelta begin_main_frame_queue_duration_critical =
       base::TimeDelta::FromMilliseconds(2);
   base::TimeDelta begin_main_frame_queue_duration_not_critical =
       base::TimeDelta::FromMilliseconds(1);
   base::TimeDelta begin_main_frame_start_to_commit_duration =
       base::TimeDelta::FromMilliseconds(1);
 
   // A single critical frame that is slow.
-  timing_history_.WillBeginMainFrame(true);
+  timing_history_.WillBeginMainFrame(true, Now());
   AdvanceNowBy(begin_main_frame_queue_duration_critical);
   timing_history_.BeginMainFrameStarted(Now());
   AdvanceNowBy(begin_main_frame_start_to_commit_duration);
   // BeginMainFrameAborted counts as a commit complete.
   timing_history_.BeginMainFrameAborted();
 
   // A bunch of faster non critical frames that are newer.
   for (int i = 0; i < 100; i++) {
-    timing_history_.WillBeginMainFrame(false);
+    timing_history_.WillBeginMainFrame(false, Now());
     AdvanceNowBy(begin_main_frame_queue_duration_not_critical);
     timing_history_.BeginMainFrameStarted(Now());
     AdvanceNowBy(begin_main_frame_start_to_commit_duration);
     // BeginMainFrameAborted counts as a commit complete.
     timing_history_.BeginMainFrameAborted();
   }
 
   // Recent fast non critical BeginMainFrames should result in the
   // critical estimate also being fast.
   EXPECT_EQ(begin_main_frame_queue_duration_not_critical,
@@ skipping 16 matching lines @@
   // which is unexpected, but could occur if one type of frame
   // hasn't been sent for a significant amount of time.
   base::TimeDelta begin_main_frame_queue_duration_critical =
       base::TimeDelta::FromMilliseconds(2);
   base::TimeDelta begin_main_frame_queue_duration_not_critical =
       base::TimeDelta::FromMilliseconds(1);
   base::TimeDelta begin_main_frame_start_to_commit_duration =
       base::TimeDelta::FromMilliseconds(1);
 
   // A single non critical frame that is fast.
-  timing_history_.WillBeginMainFrame(false);
+  timing_history_.WillBeginMainFrame(false, Now());
   AdvanceNowBy(begin_main_frame_queue_duration_not_critical);
   timing_history_.BeginMainFrameStarted(Now());
   AdvanceNowBy(begin_main_frame_start_to_commit_duration);
   timing_history_.BeginMainFrameAborted();
 
   // A bunch of slower critical frames that are newer.
   for (int i = 0; i < 100; i++) {
-    timing_history_.WillBeginMainFrame(true);
+    timing_history_.WillBeginMainFrame(true, Now());
     AdvanceNowBy(begin_main_frame_queue_duration_critical);
     timing_history_.BeginMainFrameStarted(Now());
     AdvanceNowBy(begin_main_frame_start_to_commit_duration);
     timing_history_.BeginMainFrameAborted();
   }
 
   // Recent slow critical BeginMainFrames should result in the
   // not critical estimate also being slow.
   EXPECT_EQ(begin_main_frame_queue_duration_critical,
             timing_history_.BeginMainFrameQueueDurationCriticalEstimate());
   EXPECT_EQ(begin_main_frame_queue_duration_critical,
             timing_history_.BeginMainFrameQueueDurationNotCriticalEstimate());
 
   EXPECT_EQ(begin_main_frame_start_to_commit_duration,
             timing_history_.BeginMainFrameStartToCommitDurationEstimate());
 
   base::TimeDelta begin_main_frame_to_commit_duration_expected_ =
       begin_main_frame_queue_duration_critical +
       begin_main_frame_start_to_commit_duration;
   EXPECT_EQ(begin_main_frame_to_commit_duration_expected_,
             timing_history_.BeginMainFrameToCommitDurationEstimate());
 }
 
 }  // namespace
 }  // namespace cc