New scroll latency metrics added for touch and wheel.

content/browser/renderer_host/input/render_widget_host_latency_tracker_unittest.cc

 // Copyright 2014 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 "base/test/histogram_tester.h"
 #include "content/browser/renderer_host/input/render_widget_host_latency_tracker.h"
 #include "content/common/input/synthetic_web_input_event_builders.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::Bucket;
 using blink::WebInputEvent;
 using testing::ElementsAre;
 
 namespace content {
 namespace {
 
+void AddFakeComponentsWithTimeStamp(
+    const RenderWidgetHostLatencyTracker& tracker,
+    ui::LatencyInfo* latency,
+    base::TimeTicks time_stamp) {
+  latency->AddLatencyNumberWithTimestamp(ui::INPUT_EVENT_LATENCY_UI_COMPONENT,
+                                         0, 0, time_stamp, 1);
+  latency->AddLatencyNumberWithTimestamp(
+      ui::INPUT_EVENT_LATENCY_TERMINATED_FRAME_SWAP_COMPONENT, 0, 0, time_stamp,
+      1);
+  latency->AddLatencyNumberWithTimestamp(
+      ui::INPUT_EVENT_GPU_SWAP_BUFFER_COMPONENT, 0, 0, time_stamp, 1);
+  latency->AddLatencyNumberWithTimestamp(
+      ui::INPUT_EVENT_LATENCY_FIRST_SCROLL_UPDATE_ORIGINAL_COMPONENT,
+      tracker.latency_component_id(), 0, time_stamp, 1);
+  latency->AddLatencyNumberWithTimestamp(
+      ui::INPUT_EVENT_LATENCY_RENDERER_SWAP_COMPONENT, 0, 0, time_stamp, 1);
+  latency->AddLatencyNumberWithTimestamp(
+      ui::INPUT_EVENT_BROWSER_RECEIVED_RENDERER_SWAP_COMPONENT, 0, 0,
+      time_stamp, 1);
+}
+
 void AddFakeComponents(const RenderWidgetHostLatencyTracker& tracker,
                        ui::LatencyInfo* latency) {
-  latency->AddLatencyNumberWithTimestamp(
-      ui::INPUT_EVENT_LATENCY_UI_COMPONENT, 0, 0, base::TimeTicks::Now(), 1);
-  latency->AddLatencyNumberWithTimestamp(
-      ui::INPUT_EVENT_LATENCY_TERMINATED_FRAME_SWAP_COMPONENT, 0, 0,
-      base::TimeTicks::Now(), 1);
-  latency->AddLatencyNumberWithTimestamp(
-      ui::INPUT_EVENT_GPU_SWAP_BUFFER_COMPONENT, 0, 0,
-      base::TimeTicks::Now(), 1);
-  latency->AddLatencyNumberWithTimestamp(
-      ui::INPUT_EVENT_LATENCY_FIRST_SCROLL_UPDATE_ORIGINAL_COMPONENT,
-      tracker.latency_component_id(), 0, base::TimeTicks::Now(), 1);
-  latency->AddLatencyNumberWithTimestamp(
-      ui::INPUT_EVENT_LATENCY_RENDERER_SWAP_COMPONENT, 0, 0,
-      base::TimeTicks::Now(), 1);
-  latency->AddLatencyNumberWithTimestamp(
-      ui::INPUT_EVENT_BROWSER_RECEIVED_RENDERER_SWAP_COMPONENT, 0, 0,
-      base::TimeTicks::Now(), 1);
+  AddFakeComponentsWithTimeStamp(tracker, latency, base::TimeTicks::Now());
 }
 
-void AddRenderingScheduledComponent(ui::LatencyInfo* latency, bool main) {
+void AddRenderingScheduledComponent(ui::LatencyInfo* latency,
+                                    bool main,
+                                    base::TimeTicks time_stamp) {
   if (main) {
     latency->AddLatencyNumberWithTimestamp(
         ui::INPUT_EVENT_LATENCY_RENDERING_SCHEDULED_MAIN_COMPONENT, 0, 0,
-        base::TimeTicks::Now(), 1);
+        time_stamp, 1);
 
   } else {
-  latency->AddLatencyNumberWithTimestamp(
-      ui::INPUT_EVENT_LATENCY_RENDERING_SCHEDULED_IMPL_COMPONENT, 0, 0,
-      base::TimeTicks::Now(), 1);
+    latency->AddLatencyNumberWithTimestamp(
+        ui::INPUT_EVENT_LATENCY_RENDERING_SCHEDULED_IMPL_COMPONENT, 0, 0,
+        time_stamp, 1);
   }
 }
 
 }  // namespace
 
 class RenderWidgetHostLatencyTrackerTest : public testing::Test {
  public:
   RenderWidgetHostLatencyTrackerTest() {
     tracker_.Initialize(kTestRoutingId, kTestProcessId);
     ResetHistograms();
@@ skipping 21 matching lines @@
     return *histogram_tester_;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(RenderWidgetHostLatencyTrackerTest);
   const int kTestRoutingId = 3;
   const int kTestProcessId = 1;
   std::unique_ptr<base::HistogramTester> histogram_tester_;
   RenderWidgetHostLatencyTracker tracker_;
 };
+TEST_F(RenderWidgetHostLatencyTrackerTest, TestWheelHistograms) {
+  for (bool rendering_on_main : {false, true}) {
+    for (bool is_running_navigation_hint_task : {false, true}) {
+      ResetHistograms();
+      {
+        auto wheel = SyntheticWebMouseWheelEventBuilder::Build(
+            blink::WebMouseWheelEvent::PhaseChanged);
+        base::TimeTicks now = base::TimeTicks::Now();
+        wheel.timeStampSeconds = (now - base::TimeTicks()).InSecondsF();
+        ui::LatencyInfo wheel_latency(ui::SourceEventType::WHEEL);
+        AddFakeComponentsWithTimeStamp(*tracker(), &wheel_latency, now);
+        AddRenderingScheduledComponent(&wheel_latency, rendering_on_main, now);
+        tracker()->OnInputEvent(wheel, &wheel_latency);
+        EXPECT_TRUE(wheel_latency.FindLatency(
+            ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT,
+            tracker()->latency_component_id(), nullptr));
+        EXPECT_TRUE(wheel_latency.FindLatency(
+            ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 0, nullptr));
+        EXPECT_EQ(1U, wheel_latency.input_coordinates_size());
+        tracker()->OnInputEventAck(wheel, &wheel_latency,
+                                   INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
+        tracker()->OnFrameSwapped(wheel_latency,
+                                  is_running_navigation_hint_task);
+        EXPECT_TRUE(HistogramSizeEq("Event.Latency.Browser.WheelUI", 1));
+        EXPECT_TRUE(HistogramSizeEq("Event.Latency.Browser.WheelAcked", 1));
 
-TEST_F(RenderWidgetHostLatencyTrackerTest, TestHistograms) {
-  for (bool rendering_on_main : { false, true }) {
+        EXPECT_TRUE(HistogramSizeEq(
+            "Event.Latency.Wheel.TimeToFirstScrollUpdateSwapBegin2", 1));
+
+        EXPECT_TRUE(HistogramSizeEq(
+            "Event.Latency.ScrollUpdate.Wheel.TimeToHandled2_Main",
+            rendering_on_main ? 1 : 0));
+        EXPECT_TRUE(HistogramSizeEq(
+            "Event.Latency.ScrollUpdate.Wheel.TimeToHandled2_Impl",
+            rendering_on_main ? 0 : 1));
+        EXPECT_TRUE(HistogramSizeEq(
+            "Event.Latency.ScrollUpdate.Wheel.HandledToRendererSwap2_Main",
+            rendering_on_main ? 1 : 0));
+        EXPECT_TRUE(HistogramSizeEq(
+            "Event.Latency.ScrollUpdate.Wheel.HandledToRendererSwap2_Impl",
+            rendering_on_main ? 0 : 1));
+        EXPECT_TRUE(HistogramSizeEq(
+            "Event.Latency.ScrollUpdate.Wheel.RendererSwapToBrowserNotified2",
+            1));
+        EXPECT_TRUE(HistogramSizeEq(
+            "Event.Latency.ScrollUpdate.Wheel.BrowserNotifiedToBeforeGpuSwap2",
+            1));
+        EXPECT_TRUE(
+            HistogramSizeEq("Event.Latency.ScrollUpdate.Wheel.GpuSwap2", 1));
+      }
+    }
+  }
+}
+
+TEST_F(RenderWidgetHostLatencyTrackerTest, TestTouchHistograms) {
+  for (bool rendering_on_main : {false, true}) {
     for (bool is_running_navigation_hint_task : {false, true}) {
       ResetHistograms();
       {
         auto scroll = SyntheticWebGestureEventBuilder::BuildScrollUpdate(
             5.f, -5.f, 0, blink::WebGestureDeviceTouchscreen);
-        scroll.timeStampSeconds =
-            (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF();
+        base::TimeTicks now = base::TimeTicks::Now();
+        scroll.timeStampSeconds = (now - base::TimeTicks()).InSecondsF();
         ui::LatencyInfo scroll_latency;
-        AddFakeComponents(*tracker(), &scroll_latency);
-        AddRenderingScheduledComponent(&scroll_latency, rendering_on_main);
+        AddFakeComponentsWithTimeStamp(*tracker(), &scroll_latency, now);
+        AddRenderingScheduledComponent(&scroll_latency, rendering_on_main, now);
         tracker()->OnInputEvent(scroll, &scroll_latency);
         EXPECT_TRUE(scroll_latency.FindLatency(
             ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT,
             tracker()->latency_component_id(), nullptr));
         EXPECT_TRUE(scroll_latency.FindLatency(
             ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 0, nullptr));
         EXPECT_EQ(1U, scroll_latency.input_coordinates_size());
         tracker()->OnInputEventAck(scroll, &scroll_latency,
                                    INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
       }
 
       {
-        auto wheel = SyntheticWebMouseWheelEventBuilder::Build(
-            blink::WebMouseWheelEvent::PhaseChanged);
-        wheel.timeStampSeconds =
-            (base::TimeTicks::Now() - base::TimeTicks()).InSecondsF();
-        ui::LatencyInfo wheel_latency;
-        AddFakeComponents(*tracker(), &wheel_latency);
-        AddRenderingScheduledComponent(&wheel_latency, rendering_on_main);
-        tracker()->OnInputEvent(wheel, &wheel_latency);
-        EXPECT_TRUE(wheel_latency.FindLatency(
-            ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT,
-            tracker()->latency_component_id(), nullptr));
-        EXPECT_TRUE(wheel_latency.FindLatency(
-            ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 0, nullptr));
-        EXPECT_EQ(1U, wheel_latency.input_coordinates_size());
-        tracker()->OnInputEventAck(wheel, &wheel_latency,
-                                   INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
-      }
-
-      {
         SyntheticWebTouchEvent touch;
         touch.PressPoint(0, 0);
         touch.PressPoint(1, 1);
-        ui::LatencyInfo touch_latency;
-        AddFakeComponents(*tracker(), &touch_latency);
-        AddRenderingScheduledComponent(&touch_latency, rendering_on_main);
+        ui::LatencyInfo touch_latency(ui::SourceEventType::TOUCH);
+        base::TimeTicks now = base::TimeTicks::Now();
+        AddFakeComponentsWithTimeStamp(*tracker(), &touch_latency, now);
+        AddRenderingScheduledComponent(&touch_latency, rendering_on_main, now);
         tracker()->OnInputEvent(touch, &touch_latency);
         EXPECT_TRUE(touch_latency.FindLatency(
             ui::INPUT_EVENT_LATENCY_BEGIN_RWH_COMPONENT,
             tracker()->latency_component_id(), nullptr));
         EXPECT_TRUE(touch_latency.FindLatency(
             ui::INPUT_EVENT_LATENCY_ORIGINAL_COMPONENT, 0, nullptr));
         EXPECT_EQ(2U, touch_latency.input_coordinates_size());
         tracker()->OnInputEventAck(touch, &touch_latency,
                                    INPUT_EVENT_ACK_STATE_NOT_CONSUMED);
         tracker()->OnFrameSwapped(touch_latency,
                                   is_running_navigation_hint_task);
       }
 
-      EXPECT_TRUE(HistogramSizeEq("Event.Latency.Browser.WheelUI", 1));
       EXPECT_TRUE(HistogramSizeEq("Event.Latency.Browser.TouchUI", 1));
-      EXPECT_TRUE(HistogramSizeEq("Event.Latency.Browser.WheelAcked", 1));
       EXPECT_TRUE(HistogramSizeEq("Event.Latency.Browser.TouchAcked", 1));
       EXPECT_TRUE(HistogramSizeEq(
           "Event.Latency.TouchToFirstScrollUpdateSwapBegin", 1));
       EXPECT_TRUE(
           HistogramSizeEq("Event.Latency.TouchToFirstScrollUpdateSwapBegin_"
                           "IsRunningNavigationHintTask",
                           is_running_navigation_hint_task ? 1 : 0));
       EXPECT_TRUE(
           HistogramSizeEq("Event.Latency.TouchToScrollUpdateSwapBegin", 1));
       EXPECT_TRUE(
@@ skipping 10 matching lines @@
           "Event.Latency.ScrollUpdate.HandledToRendererSwap_Main",
           rendering_on_main ? 1 : 0));
       EXPECT_TRUE(HistogramSizeEq(
           "Event.Latency.ScrollUpdate.HandledToRendererSwap_Impl",
           rendering_on_main ? 0 : 1));
       EXPECT_TRUE(HistogramSizeEq(
           "Event.Latency.ScrollUpdate.RendererSwapToBrowserNotified", 1));
       EXPECT_TRUE(HistogramSizeEq(
           "Event.Latency.ScrollUpdate.BrowserNotifiedToBeforeGpuSwap", 1));
       EXPECT_TRUE(HistogramSizeEq("Event.Latency.ScrollUpdate.GpuSwap", 1));
+      EXPECT_TRUE(HistogramSizeEq(
+          "Event.Latency.Touch.TimeToFirstScrollUpdateSwapBegin2", 1));
+
+      EXPECT_TRUE(HistogramSizeEq(
+          "Event.Latency.Touch.TimeToScrollUpdateSwapBegin2", 0));
+
+      EXPECT_TRUE(HistogramSizeEq(
+          "Event.Latency.ScrollUpdate.Touch.TimeToHandled2_Main",
+          rendering_on_main ? 1 : 0));
+      EXPECT_TRUE(HistogramSizeEq(
+          "Event.Latency.ScrollUpdate.Touch.TimeToHandled2_Impl",
+          rendering_on_main ? 0 : 1));
+      EXPECT_TRUE(HistogramSizeEq(
+          "Event.Latency.ScrollUpdate.Touch.HandledToRendererSwap2_Main",
+          rendering_on_main ? 1 : 0));
+      EXPECT_TRUE(HistogramSizeEq(
+          "Event.Latency.ScrollUpdate.Touch.HandledToRendererSwap2_Impl",
+          rendering_on_main ? 0 : 1));
+      EXPECT_TRUE(HistogramSizeEq(
+          "Event.Latency.ScrollUpdate.Touch.RendererSwapToBrowserNotified2",
+          1));
+      EXPECT_TRUE(HistogramSizeEq(
+          "Event.Latency.ScrollUpdate.Touch.BrowserNotifiedToBeforeGpuSwap2",
+          1));
+      EXPECT_TRUE(
+          HistogramSizeEq("Event.Latency.ScrollUpdate.Touch.GpuSwap2", 1));
     }
   }
 }
 
 TEST_F(RenderWidgetHostLatencyTrackerTest,
        LatencyTerminatedOnAckIfRenderingNotScheduled) {
   {
     auto scroll = SyntheticWebGestureEventBuilder::BuildScrollBegin(
         5.f, -5.f, blink::WebGestureDeviceTouchscreen);
     ui::LatencyInfo scroll_latency;
@@ skipping 375 matching lines @@
                   "Event.Latency.BlockingTime.TouchEndDefaultPrevented"),
               ElementsAre(Bucket(
                   touchend_timestamps_ms[2] - touchend_timestamps_ms[1], 1)));
   EXPECT_THAT(histogram_tester().GetAllSamples(
                   "Event.Latency.BlockingTime.TouchEndDefaultAllowed"),
               ElementsAre(Bucket(
                   touchend_timestamps_ms[2] - touchend_timestamps_ms[1], 1)));
 }
 
 }  // namespace content