Refactor WebInputEventAura to ui/events/blink

ui/events/blink/web_input_event.cc

Index: ui/events/blink/web_input_event.cc
diff --git a/content/browser/renderer_host/web_input_event_aura.cc b/ui/events/blink/web_input_event.cc
similarity index 58%
rename from content/browser/renderer_host/web_input_event_aura.cc
rename to ui/events/blink/web_input_event.cc
index e0fa0a558468bffa400f23985c28521eb17112c7..ec4d584d372ffe53fc2142c34d8f3a74022edb47 100644
--- a/content/browser/renderer_host/web_input_event_aura.cc
+++ b/ui/events/blink/web_input_event.cc
@@ -2,12 +2,8 @@
 // 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/web_input_event_aura.h"
+#include "ui/events/blink/web_input_event.h"
 
-#include "build/build_config.h"
-#include "content/browser/renderer_host/input/web_input_event_util.h"
-#include "ui/aura/client/screen_position_client.h"
-#include "ui/aura/window.h"
 #include "ui/events/base_event_utils.h"
 #include "ui/events/blink/blink_event_util.h"
 #include "ui/events/event.h"
@@ -15,86 +11,108 @@
 #include "ui/events/keycodes/dom/keycode_converter.h"
 #include "ui/events/keycodes/keyboard_code_conversion.h"
 
-namespace content {
-
-namespace {
-
-gfx::Point GetScreenLocationFromEvent(const ui::LocatedEvent& event) {
-  if (!event.target())
-    return event.root_location();
+#if defined(OS_WIN)
+#include "ui/events/blink/web_input_event_builders_win.h"
+#endif
 
-  aura::Window* root =
-      static_cast<aura::Window*>(event.target())->GetRootWindow();
-  aura::client::ScreenPositionClient* spc =
-      aura::client::GetScreenPositionClient(root);
-  if (!spc)
-    return event.root_location();
+namespace ui {
 
-  gfx::Point screen_location(event.root_location());
-  spc->ConvertPointToScreen(root, &screen_location);
-  return screen_location;
+namespace {
+// Used for scrolling. This matches Firefox behavior.
+const int kPixelsPerTick = 53;
+
+gfx::Point GetScreenLocationFromEvent(
+    const LocatedEvent& event,
+    const base::Callback<gfx::Point(const LocatedEvent& event)>&
+        screen_location_callback) {
+  return event.target() ? screen_location_callback.Run(event)

[sadrul, 2016/08/15 15:55:12]

DCHECK that screen_location_callback is non-null

[jonross, 2016/08/16 15:25:16]

Done.

+                        : event.root_location();
 }
 
 blink::WebPointerProperties::PointerType EventPointerTypeToWebPointerType(
-    ui::EventPointerType pointer_type) {
+    EventPointerType pointer_type) {
   switch (pointer_type) {
-    case ui::EventPointerType::POINTER_TYPE_UNKNOWN:
+    case EventPointerType::POINTER_TYPE_UNKNOWN:
       return blink::WebPointerProperties::PointerType::Unknown;
-    case ui::EventPointerType::POINTER_TYPE_MOUSE:
+    case EventPointerType::POINTER_TYPE_MOUSE:
       return blink::WebPointerProperties::PointerType::Mouse;
-    case ui::EventPointerType::POINTER_TYPE_PEN:
+    case EventPointerType::POINTER_TYPE_PEN:
       return blink::WebPointerProperties::PointerType::Pen;
-    case ui::EventPointerType::POINTER_TYPE_TOUCH:
+    case EventPointerType::POINTER_TYPE_TOUCH:
       return blink::WebPointerProperties::PointerType::Touch;
   }
   NOTREACHED() << "Unexpected EventPointerType";
   return blink::WebPointerProperties::PointerType::Unknown;
 }
 
-// Creates a WebGestureEvent from a ui::GestureEvent. Note that it does not
+// Creates a WebGestureEvent from a GestureEvent. Note that it does not
 // populate the event coordinates (i.e. |x|, |y|, |globalX|, and |globalY|). So
 // the caller must populate these fields.
 blink::WebGestureEvent MakeWebGestureEventFromUIEvent(
-    const ui::GestureEvent& event) {
-  return ui::CreateWebGestureEvent(
-      event.details(), event.time_stamp(), event.location_f(),
-      event.root_location_f(), event.flags(), event.unique_touch_event_id());
+    const GestureEvent& event) {
+  return CreateWebGestureEvent(event.details(), event.time_stamp(),
+                               event.location_f(), event.root_location_f(),
+                               event.flags(), event.unique_touch_event_id());
 }
 
 }  // namespace
 
 #if defined(OS_WIN)
+// On Windows, we can just use the builtin WebKit factory methods to fully
+// construct our pre-translated events.
+
 blink::WebMouseEvent MakeUntranslatedWebMouseEventFromNativeEvent(
     const base::NativeEvent& native_event,
     const base::TimeTicks& time_stamp,
-    blink::WebPointerProperties::PointerType pointer_type);
+    blink::WebPointerProperties::PointerType pointer_type) {
+  return WebMouseEventBuilder::Build(native_event.hwnd, native_event.message,
+                                     native_event.wParam, native_event.lParam,
+                                     ui::EventTimeStampToSeconds(time_stamp),
+                                     pointer_type);
+}
+
 blink::WebMouseWheelEvent MakeUntranslatedWebMouseWheelEventFromNativeEvent(
     const base::NativeEvent& native_event,
     const base::TimeTicks& time_stamp,
-    blink::WebPointerProperties::PointerType pointer_type);
+    blink::WebPointerProperties::PointerType pointer_type) {
+  return WebMouseWheelEventBuilder::Build(
+      native_event.hwnd, native_event.message, native_event.wParam,
+      native_event.lParam, ui::EventTimeStampToSeconds(time_stamp),
+      pointer_type);
+}
+
 blink::WebKeyboardEvent MakeWebKeyboardEventFromNativeEvent(
     const base::NativeEvent& native_event,
-    const base::TimeTicks& time_stamp);
+    const base::TimeTicks& time_stamp) {
+  return WebKeyboardEventBuilder::Build(
+      native_event.hwnd, native_event.message, native_event.wParam,
+      native_event.lParam, ui::EventTimeStampToSeconds(time_stamp));
+}
+
 blink::WebGestureEvent MakeWebGestureEventFromNativeEvent(

[sadrul, 2016/08/15 15:55:12]

We should just remove this (maybe in a follow up CL). We do not receive gesture
events from the platform on Windows.

I think we can get rid of some of the builders from blink, and instead use the
code here in events/blink. You shouldn't do that in this CL, but something to
keep in mind.

[jonross, 2016/08/16 15:25:16]

I've noted this on the bug.

     const base::NativeEvent& native_event,
-    const base::TimeTicks& time_stamp);
-#endif
+    const base::TimeTicks& time_stamp) {
+  // TODO: Create gestures from native event.
+  NOTIMPLEMENTED();
+  return blink::WebGestureEvent();
+}
+
+#endif  // defined(OS_WIN)
 
-blink::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent(
-    const ui::KeyEvent& event) {
+blink::WebKeyboardEvent MakeWebKeyboardEventFromUiEvent(
+    const KeyEvent& event) {
   blink::WebKeyboardEvent webkit_event;
 
-  webkit_event.timeStampSeconds =
-      ui::EventTimeStampToSeconds(event.time_stamp());
-  webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags()) |
+  webkit_event.timeStampSeconds = EventTimeStampToSeconds(event.time_stamp());
+  webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags()) |
                            DomCodeToWebInputEventModifiers(event.code());
 
   switch (event.type()) {
-    case ui::ET_KEY_PRESSED:
-      webkit_event.type = event.is_char() ? blink::WebInputEvent::Char :
-          blink::WebInputEvent::RawKeyDown;
+    case ET_KEY_PRESSED:
+      webkit_event.type = event.is_char() ? blink::WebInputEvent::Char
+                                          : blink::WebInputEvent::RawKeyDown;
       break;
-    case ui::ET_KEY_RELEASED:
+    case ET_KEY_RELEASED:
       webkit_event.type = blink::WebInputEvent::KeyUp;
       break;
     default:
@@ -108,9 +126,9 @@ blink::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent(
   // key_code events that aren't "located" for the keypad like
   // Windows and X11 do and blink expects.
   webkit_event.windowsKeyCode =
-      ui::NonLocatedToLocatedKeypadKeyboardCode(event.key_code(), event.code());
+      NonLocatedToLocatedKeypadKeyboardCode(event.key_code(), event.code());
   webkit_event.nativeKeyCode =
-    ui::KeycodeConverter::DomCodeToNativeKeycode(event.code());
+      KeycodeConverter::DomCodeToNativeKeycode(event.code());
   webkit_event.domCode = static_cast<int>(event.code());
   webkit_event.domKey = static_cast<int>(event.GetDomKey());
   webkit_event.unmodifiedText[0] = event.GetUnmodifiedText();
@@ -119,20 +137,19 @@ blink::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent(
   return webkit_event;
 }
 
-blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
-    const ui::ScrollEvent& event) {
+blink::WebMouseWheelEvent MakeWebMouseWheelEventFromUiEvent(
+    const ScrollEvent& event) {
   blink::WebMouseWheelEvent webkit_event;
 
   webkit_event.type = blink::WebInputEvent::MouseWheel;
   webkit_event.button = blink::WebMouseEvent::ButtonNone;
-  webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags());
-  webkit_event.timeStampSeconds =
-      ui::EventTimeStampToSeconds(event.time_stamp());
+  webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
+  webkit_event.timeStampSeconds = EventTimeStampToSeconds(event.time_stamp());
   webkit_event.hasPreciseScrollingDeltas = true;
 
   float offset_ordinal_x = 0.f;
   float offset_ordinal_y = 0.f;
-  if ((event.flags() & ui::EF_SHIFT_DOWN) != 0 && event.x_offset() == 0) {
+  if ((event.flags() & EF_SHIFT_DOWN) != 0 && event.x_offset() == 0) {
     webkit_event.deltaX = event.y_offset();
     webkit_event.deltaY = 0;
     offset_ordinal_x = event.y_offset_ordinal();
@@ -156,20 +173,20 @@ blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
   return webkit_event;
 }
 
-blink::WebGestureEvent MakeWebGestureEventFromAuraEvent(
-    const ui::ScrollEvent& event) {
+blink::WebGestureEvent MakeWebGestureEventFromUiEvent(
+    const ScrollEvent& event) {
   blink::WebGestureEvent webkit_event;
 
   switch (event.type()) {
-    case ui::ET_SCROLL_FLING_START:
+    case ET_SCROLL_FLING_START:
       webkit_event.type = blink::WebInputEvent::GestureFlingStart;
       webkit_event.data.flingStart.velocityX = event.x_offset();
       webkit_event.data.flingStart.velocityY = event.y_offset();
       break;
-    case ui::ET_SCROLL_FLING_CANCEL:
+    case ET_SCROLL_FLING_CANCEL:
       webkit_event.type = blink::WebInputEvent::GestureFlingCancel;
       break;
-    case ui::ET_SCROLL:
+    case ET_SCROLL:
       NOTREACHED() << "Invalid gesture type: " << event.type();
       break;
     default:
@@ -177,54 +194,56 @@ blink::WebGestureEvent MakeWebGestureEventFromAuraEvent(
   }
 
   webkit_event.sourceDevice = blink::WebGestureDeviceTouchpad;
-  webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags());
-  webkit_event.timeStampSeconds =
-      ui::EventTimeStampToSeconds(event.time_stamp());
+  webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
+  webkit_event.timeStampSeconds = EventTimeStampToSeconds(event.time_stamp());
   return webkit_event;
 }
 
-blink::WebMouseEvent MakeWebMouseEventFromAuraEvent(
-    const ui::MouseEvent& event);
-blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
-    const ui::MouseWheelEvent& event);
+blink::WebMouseEvent MakeWebMouseEventFromUiEvent(const MouseEvent& event);
+blink::WebMouseWheelEvent MakeWebMouseWheelEventFromUiEvent(
+    const MouseWheelEvent& event);
 
 // General approach:
 //
-// ui::Event only carries a subset of possible event data provided to Aura by
-// the host platform. WebKit utilizes a larger subset of that information than
-// Aura itself. WebKit includes some built in cracking functionality that we
-// rely on to obtain this information cleanly and consistently.
+// Event only carries a subset of possible event data provided to UI by the host
+// platform. WebKit utilizes a larger subset of that information, and includes
+// some built in cracking functionality that we rely on to obtain this
+// information cleanly and consistently.
 //
-// The only place where an ui::Event's data differs from what the underlying
-// base::NativeEvent would provide is position data, since we would like to
-// provide coordinates relative to the aura::Window that is hosting the
-// renderer, not the top level platform window.
+// The only place where an Event's data differs from what the underlying
+// base::NativeEvent would provide is position data. We would like to provide
+// coordinates relative to its hosting window, rather than the top level
+// platform window. To do this a callback is accepted to allow for clients to
+// map the coordinates.
 //
 // The approach is to fully construct a blink::WebInputEvent from the
-// ui::Event's base::NativeEvent, and then replace the coordinate fields with
-// the translated values from the ui::Event.
+// Event's base::NativeEvent, and then replace the coordinate fields with
+// the translated values from the Event.
 //
-// The exception is mouse events on linux. The ui::MouseEvent contains enough
+// The exception is mouse events on linux. The MouseEvent contains enough
 // necessary information to construct a WebMouseEvent. So instead of extracting
 // the information from the XEvent, which can be tricky when supporting both
 // XInput2 and XInput, the WebMouseEvent is constructed from the
-// ui::MouseEvent. This will not be necessary once only XInput2 is supported.
+// MouseEvent. This will not be necessary once only XInput2 is supported.
 //
 
-blink::WebMouseEvent MakeWebMouseEvent(const ui::MouseEvent& event) {
+blink::WebMouseEvent MakeWebMouseEvent(
+    const MouseEvent& event,
+    const base::Callback<gfx::Point(const ui::LocatedEvent& event)>&
+        screen_location_callback) {
   // Construct an untranslated event from the platform event data.
   blink::WebMouseEvent webkit_event =
 #if defined(OS_WIN)
-      // On Windows we have WM_ events comming from desktop and pure aura
-      // events comming from metro mode.
-      event.native_event().message && (event.type() != ui::ET_MOUSE_EXITED)
+      // On Windows we have WM_ events comming from desktop and pure ui::Events
+      // comming from metro mode.
+      event.native_event().message && (event.type() != ET_MOUSE_EXITED)
           ? MakeUntranslatedWebMouseEventFromNativeEvent(
                 event.native_event(), event.time_stamp(),
                 EventPointerTypeToWebPointerType(
                     event.pointer_details().pointer_type))
-          : MakeWebMouseEventFromAuraEvent(event);
+          : MakeWebMouseEventFromUiEvent(event);
 #else
-      MakeWebMouseEventFromAuraEvent(event);
+      MakeWebMouseEventFromUiEvent(event);
 #endif
   // Replace the event's coordinate fields with translated position data from
   // |event|.
@@ -235,7 +254,9 @@ blink::WebMouseEvent MakeWebMouseEvent(const ui::MouseEvent& event) {
   if (event.native_event().message)
     return webkit_event;
 #endif
-  const gfx::Point screen_point = GetScreenLocationFromEvent(event);
+
+  const gfx::Point screen_point =
+      GetScreenLocationFromEvent(event, screen_location_callback);
   webkit_event.globalX = screen_point.x();
   webkit_event.globalY = screen_point.y();
 
@@ -243,7 +264,9 @@ blink::WebMouseEvent MakeWebMouseEvent(const ui::MouseEvent& event) {
 }
 
 blink::WebMouseWheelEvent MakeWebMouseWheelEvent(
-    const ui::MouseWheelEvent& event) {
+    const MouseWheelEvent& event,
+    const base::Callback<gfx::Point(const ui::LocatedEvent& event)>&
+        screen_location_callback) {
 #if defined(OS_WIN)
   // Construct an untranslated event from the platform event data.
   blink::WebMouseWheelEvent webkit_event =
@@ -252,10 +275,10 @@ blink::WebMouseWheelEvent MakeWebMouseWheelEvent(
                 event.native_event(), event.time_stamp(),
                 EventPointerTypeToWebPointerType(
                     event.pointer_details().pointer_type))
-          : MakeWebMouseWheelEventFromAuraEvent(event);
+          : MakeWebMouseWheelEventFromUiEvent(event);
 #else
   blink::WebMouseWheelEvent webkit_event =
-      MakeWebMouseWheelEventFromAuraEvent(event);
+      MakeWebMouseWheelEventFromUiEvent(event);
 #endif
 
   // Replace the event's coordinate fields with translated position data from
@@ -263,14 +286,18 @@ blink::WebMouseWheelEvent MakeWebMouseWheelEvent(
   webkit_event.windowX = webkit_event.x = event.x();
   webkit_event.windowY = webkit_event.y = event.y();
 
-  const gfx::Point screen_point = GetScreenLocationFromEvent(event);
+  const gfx::Point screen_point =
+      GetScreenLocationFromEvent(event, screen_location_callback);
   webkit_event.globalX = screen_point.x();
   webkit_event.globalY = screen_point.y();
 
   return webkit_event;
 }
 
-blink::WebMouseWheelEvent MakeWebMouseWheelEvent(const ui::ScrollEvent& event) {
+blink::WebMouseWheelEvent MakeWebMouseWheelEvent(
+    const ScrollEvent& event,
+    const base::Callback<gfx::Point(const ui::LocatedEvent& event)>&
+        screen_location_callback) {
 #if defined(OS_WIN)
   // Construct an untranslated event from the platform event data.
   blink::WebMouseWheelEvent webkit_event =
@@ -279,10 +306,10 @@ blink::WebMouseWheelEvent MakeWebMouseWheelEvent(const ui::ScrollEvent& event) {
                 event.native_event(), event.time_stamp(),
                 EventPointerTypeToWebPointerType(
                     event.pointer_details().pointer_type))
-          : MakeWebMouseWheelEventFromAuraEvent(event);
+          : MakeWebMouseWheelEventFromUiEvent(event);
 #else
   blink::WebMouseWheelEvent webkit_event =
-      MakeWebMouseWheelEventFromAuraEvent(event);
+      MakeWebMouseWheelEventFromUiEvent(event);
 #endif
 
   // Replace the event's coordinate fields with translated position data from
@@ -290,23 +317,24 @@ blink::WebMouseWheelEvent MakeWebMouseWheelEvent(const ui::ScrollEvent& event) {
   webkit_event.windowX = webkit_event.x = event.x();
   webkit_event.windowY = webkit_event.y = event.y();
 
-  const gfx::Point screen_point = GetScreenLocationFromEvent(event);
+  const gfx::Point screen_point =
+      GetScreenLocationFromEvent(event, screen_location_callback);
   webkit_event.globalX = screen_point.x();
   webkit_event.globalY = screen_point.y();
 
   return webkit_event;
 }
 
-blink::WebKeyboardEvent MakeWebKeyboardEvent(const ui::KeyEvent& event) {
-  // Windows can figure out whether or not to construct a RawKeyDown or a Char
-  // WebInputEvent based on the type of message carried in
-  // event.native_event(). X11 is not so fortunate, there is no separate
-  // translated event type, so DesktopHostLinux sends an extra KeyEvent with
-  // is_char() == true. We need to pass the ui::KeyEvent to the X11 function
-  // to detect this case so the right event type can be constructed.
+blink::WebKeyboardEvent MakeWebKeyboardEvent(const KeyEvent& event) {
+// Windows can figure out whether or not to construct a RawKeyDown or a Char
+// WebInputEvent based on the type of message carried in
+// event.native_event(). X11 is not so fortunate, there is no separate
+// translated event type, so DesktopHostLinux sends an extra KeyEvent with
+// is_char() == true. We need to pass the KeyEvent to the X11 function
+// to detect this case so the right event type can be constructed.
 #if defined(OS_WIN)
   if (event.HasNativeEvent()) {
-    // Key events require no translation by the aura system.
+    // Key events require no translation.
     blink::WebKeyboardEvent webkit_event(MakeWebKeyboardEventFromNativeEvent(
         event.native_event(), event.time_stamp()));
     webkit_event.modifiers |= DomCodeToWebInputEventModifiers(event.code());
@@ -315,10 +343,13 @@ blink::WebKeyboardEvent MakeWebKeyboardEvent(const ui::KeyEvent& event) {
     return webkit_event;
   }
 #endif
-  return MakeWebKeyboardEventFromAuraEvent(event);
+  return MakeWebKeyboardEventFromUiEvent(event);
 }
 
-blink::WebGestureEvent MakeWebGestureEvent(const ui::GestureEvent& event) {
+blink::WebGestureEvent MakeWebGestureEvent(
+    const GestureEvent& event,
+    const base::Callback<gfx::Point(const ui::LocatedEvent& event)>&
+        screen_location_callback) {
   blink::WebGestureEvent gesture_event;
 #if defined(OS_WIN)
   if (event.HasNativeEvent())
@@ -333,27 +364,32 @@ blink::WebGestureEvent MakeWebGestureEvent(const ui::GestureEvent& event) {
   gesture_event.x = event.x();
   gesture_event.y = event.y();
 
-  const gfx::Point screen_point = GetScreenLocationFromEvent(event);
+  const gfx::Point screen_point =
+      GetScreenLocationFromEvent(event, screen_location_callback);
   gesture_event.globalX = screen_point.x();
   gesture_event.globalY = screen_point.y();
 
   return gesture_event;
 }
 
-blink::WebGestureEvent MakeWebGestureEvent(const ui::ScrollEvent& event) {
+blink::WebGestureEvent MakeWebGestureEvent(
+    const ScrollEvent& event,
+    const base::Callback<gfx::Point(const ui::LocatedEvent& event)>&
+        screen_location_callback) {
   blink::WebGestureEvent gesture_event;
 
 #if defined(OS_WIN)
   gesture_event = MakeWebGestureEventFromNativeEvent(event.native_event(),
                                                      event.time_stamp());
 #else
-  gesture_event = MakeWebGestureEventFromAuraEvent(event);
+  gesture_event = MakeWebGestureEventFromUiEvent(event);
 #endif
 
   gesture_event.x = event.x();
   gesture_event.y = event.y();
 
-  const gfx::Point screen_point = GetScreenLocationFromEvent(event);
+  const gfx::Point screen_point =
+      GetScreenLocationFromEvent(event, screen_location_callback);
   gesture_event.globalX = screen_point.x();
   gesture_event.globalY = screen_point.y();
 
@@ -365,49 +401,45 @@ blink::WebGestureEvent MakeWebGestureEventFlingCancel() {
 
   // All other fields are ignored on a GestureFlingCancel event.
   gesture_event.type = blink::WebInputEvent::GestureFlingCancel;
-  gesture_event.timeStampSeconds =
-      ui::EventTimeStampToSeconds(ui::EventTimeForNow());
+  gesture_event.timeStampSeconds = EventTimeStampToSeconds(EventTimeForNow());
   gesture_event.sourceDevice = blink::WebGestureDeviceTouchpad;
   return gesture_event;
 }
 
-blink::WebMouseEvent MakeWebMouseEventFromAuraEvent(
-    const ui::MouseEvent& event) {
+blink::WebMouseEvent MakeWebMouseEventFromUiEvent(const MouseEvent& event) {
   blink::WebMouseEvent webkit_event;
 
-  webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags());
-  webkit_event.timeStampSeconds =
-      ui::EventTimeStampToSeconds(event.time_stamp());
+  webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
+  webkit_event.timeStampSeconds = EventTimeStampToSeconds(event.time_stamp());
   webkit_event.button = blink::WebMouseEvent::ButtonNone;
   int button_flags = event.flags();
-  if (event.type() == ui::ET_MOUSE_PRESSED ||
-      event.type() == ui::ET_MOUSE_RELEASED) {
+  if (event.type() == ET_MOUSE_PRESSED || event.type() == ET_MOUSE_RELEASED) {
     // We want to use changed_button_flags() for mouse pressed & released.
     // These flags can be used only if they are set which is not always the case
     // (see e.g. GetChangedMouseButtonFlagsFromNative() in events_win.cc).
     if (event.changed_button_flags())
       button_flags = event.changed_button_flags();
   }
-  if (button_flags & ui::EF_LEFT_MOUSE_BUTTON)
+  if (button_flags & EF_LEFT_MOUSE_BUTTON)
     webkit_event.button = blink::WebMouseEvent::ButtonLeft;
-  if (button_flags & ui::EF_MIDDLE_MOUSE_BUTTON)
+  if (button_flags & EF_MIDDLE_MOUSE_BUTTON)
     webkit_event.button = blink::WebMouseEvent::ButtonMiddle;
-  if (button_flags & ui::EF_RIGHT_MOUSE_BUTTON)
+  if (button_flags & EF_RIGHT_MOUSE_BUTTON)
     webkit_event.button = blink::WebMouseEvent::ButtonRight;
 
   switch (event.type()) {
-    case ui::ET_MOUSE_PRESSED:
+    case ET_MOUSE_PRESSED:
       webkit_event.type = blink::WebInputEvent::MouseDown;
       webkit_event.clickCount = event.GetClickCount();
       break;
-    case ui::ET_MOUSE_RELEASED:
+    case ET_MOUSE_RELEASED:
       webkit_event.type = blink::WebInputEvent::MouseUp;
       webkit_event.clickCount = event.GetClickCount();
       break;
-    case ui::ET_MOUSE_ENTERED:
-    case ui::ET_MOUSE_EXITED:
-    case ui::ET_MOUSE_MOVED:
-    case ui::ET_MOUSE_DRAGGED:
+    case ET_MOUSE_ENTERED:
+    case ET_MOUSE_EXITED:
+    case ET_MOUSE_MOVED:
+    case ET_MOUSE_DRAGGED:
       webkit_event.type = blink::WebInputEvent::MouseMove;
       break;
     default:
@@ -424,17 +456,16 @@ blink::WebMouseEvent MakeWebMouseEventFromAuraEvent(
   return webkit_event;
 }
 
-blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
-    const ui::MouseWheelEvent& event) {
+blink::WebMouseWheelEvent MakeWebMouseWheelEventFromUiEvent(
+    const MouseWheelEvent& event) {
   blink::WebMouseWheelEvent webkit_event;
 
   webkit_event.type = blink::WebInputEvent::MouseWheel;
   webkit_event.button = blink::WebMouseEvent::ButtonNone;
-  webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags());
-  webkit_event.timeStampSeconds =
-      ui::EventTimeStampToSeconds(event.time_stamp());
+  webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
+  webkit_event.timeStampSeconds = EventTimeStampToSeconds(event.time_stamp());
 
-  if ((event.flags() & ui::EF_SHIFT_DOWN) != 0 && event.x_offset() == 0) {
+  if ((event.flags() & EF_SHIFT_DOWN) != 0 && event.x_offset() == 0) {
     webkit_event.deltaX = event.y_offset();
     webkit_event.deltaY = 0;
   } else {
@@ -454,4 +485,4 @@ blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
   return webkit_event;
 }
 
-}  // namespace content
+}  // namespace ui