Fix reporting of TouchToFirstScroll latency metrics

content/browser/renderer_host/input/mouse_wheel_event_queue.cc

 // Copyright 2016 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 "content/browser/renderer_host/input/mouse_wheel_event_queue.h"
 
 #include "base/metrics/histogram_macros.h"
 #include "base/stl_util.h"
 #include "base/trace_event/trace_event.h"
 
@@ skipping 154 matching lines @@
       if (needs_scroll_begin_) {
         // If no GSB has been sent, it will be a non-synthetic GSB.
         SendScrollBegin(scroll_update, false);
       } else if (has_phase_info) {
         // If a GSB has been sent, generate a synthetic GSB if we have phase
         // information. This should be removed once crbug.com/526463 is fully
         // implemented.
         SendScrollBegin(scroll_update, true);
       }
 
-      if (needs_update)
-        client_->ForwardGestureEvent(scroll_update);
+      if (needs_update) {
+        ui::LatencyInfo latency = ui::LatencyInfo();
+        latency.AddLatencyNumber(
+            ui::INPUT_EVENT_LATENCY_GENERATE_SCROLL_UPDATE_FROM_MOUSE_WHEEL, 0,
+            0);
+        client_->ForwardGestureEventWithLatencyInfo(scroll_update, latency);
+      }
 
       if (current_phase_ended) {
         // Non-synthetic GSEs are sent when the current phase is canceled or
         // ended.
         SendScrollEnd(scroll_update, false);
       } else if (has_phase_info) {
         // Generate a synthetic GSE for every update to force hit testing so
         // that the non-latching behavior is preserved. Remove once
         // crbug.com/526463 is fully implemented.
         SendScrollEnd(scroll_update, true);
@@ skipping 60 matching lines @@
   scroll_end.data.scrollEnd.deltaUnits =
       update_event.data.scrollUpdate.deltaUnits;
 
   if (!synthetic) {
     needs_scroll_begin_ = true;
     needs_scroll_end_ = false;
 
     if (scroll_end_timer_.IsRunning())
       scroll_end_timer_.Reset();
   }
-  client_->ForwardGestureEvent(scroll_end);
+  client_->ForwardGestureEventWithLatencyInfo(scroll_end, ui::LatencyInfo());
 }
 
 void MouseWheelEventQueue::SendScrollBegin(
     const WebGestureEvent& gesture_update,
     bool synthetic) {
   DCHECK((synthetic && !needs_scroll_begin_) || needs_scroll_begin_);
 
   WebGestureEvent scroll_begin(gesture_update);
   scroll_begin.type = WebInputEvent::GestureScrollBegin;
   scroll_begin.data.scrollBegin.synthetic = synthetic;
   scroll_begin.data.scrollBegin.inertial =
       gesture_update.data.scrollUpdate.inertial;
   scroll_begin.data.scrollBegin.deltaXHint =
       gesture_update.data.scrollUpdate.deltaX;
   scroll_begin.data.scrollBegin.deltaYHint =
       gesture_update.data.scrollUpdate.deltaY;
   scroll_begin.data.scrollBegin.targetViewport = false;
   scroll_begin.data.scrollBegin.deltaHintUnits =
       gesture_update.data.scrollUpdate.deltaUnits;
 
   needs_scroll_begin_ = false;
   needs_scroll_end_ = true;
-  client_->ForwardGestureEvent(scroll_begin);
+  client_->ForwardGestureEventWithLatencyInfo(scroll_begin, ui::LatencyInfo());
 }
 
 }  // namespace content