Add modifier flags to MotionEvent

content/browser/renderer_host/ui_events_helper.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/ui_events_helper.h"
 
+#include "content/browser/renderer_host/input/web_input_event_util.h"
 #include "content/common/input/web_touch_event_traits.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 
 namespace {
 
 int WebModifiersToUIFlags(int modifiers) {
   int flags = ui::EF_NONE;
 
@@ skipping 218 matching lines @@
       NOTREACHED() << "Unknown gesture type: " << event.type();
   }
 
   gesture_event.sourceDevice = blink::WebGestureDeviceTouchscreen;
   gesture_event.modifiers = EventFlagsToWebEventModifiers(event.flags());
   gesture_event.timeStampSeconds = event.time_stamp().InSecondsF();
 
   return gesture_event;
 }
 
-int EventFlagsToWebEventModifiers(int flags) {
-  int modifiers = 0;
-
-  if (flags & ui::EF_SHIFT_DOWN)
-    modifiers |= blink::WebInputEvent::ShiftKey;
-  if (flags & ui::EF_CONTROL_DOWN)
-    modifiers |= blink::WebInputEvent::ControlKey;
-  if (flags & ui::EF_ALT_DOWN)
-    modifiers |= blink::WebInputEvent::AltKey;
-  if (flags & ui::EF_COMMAND_DOWN)
-    modifiers |= blink::WebInputEvent::MetaKey;
-
-  if (flags & ui::EF_LEFT_MOUSE_BUTTON)
-    modifiers |= blink::WebInputEvent::LeftButtonDown;
-  if (flags & ui::EF_MIDDLE_MOUSE_BUTTON)
-    modifiers |= blink::WebInputEvent::MiddleButtonDown;
-  if (flags & ui::EF_RIGHT_MOUSE_BUTTON)
-    modifiers |= blink::WebInputEvent::RightButtonDown;
-  if (flags & ui::EF_CAPS_LOCK_DOWN)
-    modifiers |= blink::WebInputEvent::CapsLockOn;
-  if (flags & ui::EF_IS_REPEAT)
-    modifiers |= blink::WebInputEvent::IsAutoRepeat;
-  return modifiers;
-}
-
 blink::WebTouchPoint* UpdateWebTouchEventFromUIEvent(
     const ui::TouchEvent& event,
     blink::WebTouchEvent* web_event) {
   blink::WebTouchPoint* point = NULL;
   switch (event.type()) {
     case ui::ET_TOUCH_PRESSED:
       // Add a new touch point.
       if (web_event->touchesLength < blink::WebTouchEvent::touchesLengthCap) {
         point = &web_event->touches[web_event->touchesLength++];
         point->id = event.touch_id();
@@ skipping 47 matching lines @@
   // Update the type of the touch event.
   WebTouchEventTraits::ResetType(TouchEventTypeFromEvent(event),
                                  event.time_stamp().InSecondsF(),
                                  web_event);
   web_event->modifiers = EventFlagsToWebEventModifiers(event.flags());
 
   return point;
 }
 
 }  // namespace content