Refactors gesture conversion functions to ui/events/blink

content/browser/renderer_host/web_input_event_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/web_input_event_aura.h"
 
 #include "content/browser/renderer_host/input/web_input_event_util.h"
 #include "content/browser/renderer_host/ui_events_helper.h"
 #include "ui/aura/client/screen_position_client.h"
 #include "ui/aura/window.h"
+#include "ui/events/blink/blink_event_util.h"
 #include "ui/events/event.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/keycodes/dom4/keycode_converter.h"
 
 namespace content {
 
 namespace {
 
 gfx::Point GetScreenLocationFromEvent(const ui::LocatedEvent& event) {
   if (!event.target())
@@ skipping 22 matching lines @@
     const base::NativeEvent& native_event);
 blink::WebGestureEvent MakeWebGestureEventFromNativeEvent(
     const base::NativeEvent& native_event);
 #endif
 
 blink::WebKeyboardEvent MakeWebKeyboardEventFromAuraEvent(
     const ui::KeyEvent& event) {
   blink::WebKeyboardEvent webkit_event;
 
   webkit_event.timeStampSeconds = event.time_stamp().InSecondsF();
-  webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
+  webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags());
 
   switch (event.type()) {
     case ui::ET_KEY_PRESSED:
       webkit_event.type = event.is_char() ? blink::WebInputEvent::Char :
           blink::WebInputEvent::RawKeyDown;
       break;
     case ui::ET_KEY_RELEASED:
       webkit_event.type = blink::WebInputEvent::KeyUp;
       break;
     default:
@@ skipping 14 matching lines @@
 
   return webkit_event;
 }
 
 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
     const ui::ScrollEvent& event) {
   blink::WebMouseWheelEvent webkit_event;
 
   webkit_event.type = blink::WebInputEvent::MouseWheel;
   webkit_event.button = blink::WebMouseEvent::ButtonNone;
-  webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
+  webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags());
   webkit_event.timeStampSeconds = event.time_stamp().InSecondsF();
   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) {
     webkit_event.deltaX = event.y_offset();
     webkit_event.deltaY = 0;
     offset_ordinal_x = event.y_offset_ordinal();
     offset_ordinal_y = event.x_offset_ordinal();
@@ skipping 27 matching lines @@
       webkit_event.type = blink::WebInputEvent::GestureFlingCancel;
       break;
     case ui::ET_SCROLL:
       NOTREACHED() << "Invalid gesture type: " << event.type();
       break;
     default:
       NOTREACHED() << "Unknown gesture type: " << event.type();
   }
 
   webkit_event.sourceDevice = blink::WebGestureDeviceTouchpad;
-  webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
+  webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags());
   webkit_event.timeStampSeconds = event.time_stamp().InSecondsF();
   return webkit_event;
 }
 
 blink::WebMouseEvent MakeWebMouseEventFromAuraEvent(
     const ui::MouseEvent& event);
 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
     const ui::MouseWheelEvent& event);
 
 // General approach:
@@ skipping 164 matching lines @@
   // All other fields are ignored on a GestureFlingCancel event.
   gesture_event.type = blink::WebInputEvent::GestureFlingCancel;
   gesture_event.sourceDevice = blink::WebGestureDeviceTouchpad;
   return gesture_event;
 }
 
 blink::WebMouseEvent MakeWebMouseEventFromAuraEvent(
     const ui::MouseEvent& event) {
   blink::WebMouseEvent webkit_event;
 
-  webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
+  webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags());
   webkit_event.timeStampSeconds = event.time_stamp().InSecondsF();
 
   webkit_event.button = blink::WebMouseEvent::ButtonNone;
   int button_flags = event.flags();
   if (event.type() == ui::ET_MOUSE_PRESSED ||
       event.type() == ui::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())
@@ skipping 28 matching lines @@
 
   return webkit_event;
 }
 
 blink::WebMouseWheelEvent MakeWebMouseWheelEventFromAuraEvent(
     const ui::MouseWheelEvent& event) {
   blink::WebMouseWheelEvent webkit_event;
 
   webkit_event.type = blink::WebInputEvent::MouseWheel;
   webkit_event.button = blink::WebMouseEvent::ButtonNone;
-  webkit_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
+  webkit_event.modifiers = ui::EventFlagsToWebEventModifiers(event.flags());
   webkit_event.timeStampSeconds = event.time_stamp().InSecondsF();
 
   if ((event.flags() & ui::EF_SHIFT_DOWN) != 0 && event.x_offset() == 0) {
     webkit_event.deltaX = event.y_offset();
     webkit_event.deltaY = 0;
   } else {
     webkit_event.deltaX = event.x_offset();
     webkit_event.deltaY = event.y_offset();
   }
 
   webkit_event.wheelTicksX = webkit_event.deltaX / kPixelsPerTick;
   webkit_event.wheelTicksY = webkit_event.deltaY / kPixelsPerTick;
 
   return webkit_event;
 }
 
 }  // namespace content