SourceEventType added to LatencyInfo

content/browser/renderer_host/render_widget_host_view_aura.cc

 // Copyright (c) 2012 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/render_widget_host_view_aura.h"
 
 #include <set>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 1917 matching lines @@
                         DismissOwnedPopups,
                         reinterpret_cast<LPARAM>(toplevel_hwnd));
     }
 #endif
     blink::WebMouseWheelEvent mouse_wheel_event =
         ui::MakeWebMouseWheelEvent(static_cast<ui::MouseWheelEvent&>(*event),
                                    base::Bind(&GetScreenLocationFromEvent));
     if (mouse_wheel_event.deltaX != 0 || mouse_wheel_event.deltaY != 0) {
       if (ShouldRouteEvent(event)) {
         host_->delegate()->GetInputEventRouter()->RouteMouseWheelEvent(
-            this, &mouse_wheel_event);
+            this, &mouse_wheel_event, *event->latency());
       } else {
         ProcessMouseWheelEvent(mouse_wheel_event, *event->latency());
       }
     }
   } else {
     bool is_selection_popup =
         popup_child_host_view_ && popup_child_host_view_->NeedsInputGrab();
     if (CanRendererHandleEvent(event, mouse_locked_, is_selection_popup) &&
         !(event->flags() & ui::EF_FROM_TOUCH)) {
       // Confirm existing composition text on mouse press, to make sure
       // the input caret won't be moved with an ongoing composition text.
       if (event->type() == ui::ET_MOUSE_PRESSED)
         FinishImeCompositionSession();
 
       blink::WebMouseEvent mouse_event = ui::MakeWebMouseEvent(
           *event, base::Bind(&GetScreenLocationFromEvent));
       ModifyEventMovementAndCoords(&mouse_event);
       if (ShouldRouteEvent(event)) {
-        host_->delegate()->GetInputEventRouter()->RouteMouseEvent(this,
-                                                                  &mouse_event);
+        host_->delegate()->GetInputEventRouter()->RouteMouseEvent(
+            this, &mouse_event, *event->latency());
       } else {
         ProcessMouseEvent(mouse_event, *event->latency());
       }
 
       // Ensure that we get keyboard focus on mouse down as a plugin window may
       // have grabbed keyboard focus.
       if (event->type() == ui::ET_MOUSE_PRESSED)
         SetKeyboardFocus();
     }
   }
@@ skipping 111 matching lines @@
     blink::WebGestureEvent gesture_event = ui::MakeWebGestureEventFlingCancel();
     // Coordinates need to be transferred to the fling cancel gesture only
     // for Surface-targeting to ensure that it is targeted to the correct
     // RenderWidgetHost.
     gesture_event.x = event->x();
     gesture_event.y = event->y();
     blink::WebMouseWheelEvent mouse_wheel_event = ui::MakeWebMouseWheelEvent(
         *event, base::Bind(&GetScreenLocationFromEvent));
     if (ShouldRouteEvent(event)) {
       host_->delegate()->GetInputEventRouter()->RouteGestureEvent(
-          this, &gesture_event, ui::LatencyInfo());
+          this, &gesture_event, ui::LatencyInfo(ui::SourceEventType::WHEEL));
       host_->delegate()->GetInputEventRouter()->RouteMouseWheelEvent(
-          this, &mouse_wheel_event);
+          this, &mouse_wheel_event, *event->latency());
     } else {
       host_->ForwardGestureEvent(gesture_event);
       host_->ForwardWheelEventWithLatencyInfo(mouse_wheel_event,
                                               *event->latency());
     }
     RecordAction(base::UserMetricsAction("TrackpadScroll"));
   } else if (event->type() == ui::ET_SCROLL_FLING_START ||
              event->type() == ui::ET_SCROLL_FLING_CANCEL) {
     blink::WebGestureEvent gesture_event = ui::MakeWebGestureEvent(
         *event, base::Bind(&GetScreenLocationFromEvent));
     if (ShouldRouteEvent(event)) {
       host_->delegate()->GetInputEventRouter()->RouteGestureEvent(
-          this, &gesture_event, ui::LatencyInfo());
+          this, &gesture_event, ui::LatencyInfo(ui::SourceEventType::WHEEL));
     } else {
       host_->ForwardGestureEvent(gesture_event);
     }
     if (event->type() == ui::ET_SCROLL_FLING_START)
       RecordAction(base::UserMetricsAction("TrackpadScrollFling"));
   }
 
   event->SetHandled();
 }
 
@@ skipping 65 matching lines @@
   blink::WebGestureEvent gesture =
       ui::MakeWebGestureEvent(*event, base::Bind(&GetScreenLocationFromEvent));
   if (event->type() == ui::ET_GESTURE_TAP_DOWN) {
     // Webkit does not stop a fling-scroll on tap-down. So explicitly send an
     // event to stop any in-progress flings.
     blink::WebGestureEvent fling_cancel = gesture;
     fling_cancel.type = blink::WebInputEvent::GestureFlingCancel;
     fling_cancel.sourceDevice = blink::WebGestureDeviceTouchscreen;
     if (ShouldRouteEvent(event)) {
       host_->delegate()->GetInputEventRouter()->RouteGestureEvent(
-          this, &fling_cancel, ui::LatencyInfo());
+          this, &fling_cancel, ui::LatencyInfo(ui::SourceEventType::TOUCH));
     } else {
       host_->ForwardGestureEvent(fling_cancel);
     }
   }
 
   if (gesture.type != blink::WebInputEvent::Undefined) {
     if (ShouldRouteEvent(event)) {
       host_->delegate()->GetInputEventRouter()->RouteGestureEvent(
           this, &gesture, *event->latency());
     } else {
@@ skipping 842 matching lines @@
           ->GetTextSelection(focused_view)
           ->GetSelectedText(&selected_text)) {
     // Set the CLIPBOARD_TYPE_SELECTION to the ui::Clipboard.
     ui::ScopedClipboardWriter clipboard_writer(ui::CLIPBOARD_TYPE_SELECTION);
     clipboard_writer.WriteText(selected_text);
   }
 #endif  // defined(USE_X11) && !defined(OS_CHROMEOS)
 }
 
 }  // namespace content