| Index: ui/events/blink/blink_event_util.cc
|
| diff --git a/ui/events/blink/blink_event_util.cc b/ui/events/blink/blink_event_util.cc
|
| index a7cba9d0bfcf7db2f00a6ade41539b859aea684f..f2990685462cd17a7e3f63aa82d273821acd215f 100644
|
| --- a/ui/events/blink/blink_event_util.cc
|
| +++ b/ui/events/blink/blink_event_util.cc
|
| @@ -14,12 +14,13 @@
|
|
|
| #include "base/time/time.h"
|
| #include "build/build_config.h"
|
| -#include "third_party/WebKit/public/web/WebInputEvent.h"
|
| +#include "third_party/WebKit/public/platform/WebInputEvent.h"
|
| #include "ui/events/base_event_utils.h"
|
| #include "ui/events/event_constants.h"
|
| #include "ui/events/gesture_detection/gesture_event_data.h"
|
| #include "ui/events/gesture_detection/motion_event.h"
|
| #include "ui/events/gesture_event_details.h"
|
| +#include "ui/events/keycodes/dom/keycode_converter.h"
|
| #include "ui/gfx/geometry/safe_integer_conversions.h"
|
|
|
| using blink::WebGestureEvent;
|
| @@ -480,4 +481,47 @@ WebPointerProperties::PointerType ToWebPointerType(
|
| return WebPointerProperties::PointerType::Unknown;
|
| }
|
|
|
| +int WebEventModifiersToEventFlags(int modifiers) {
|
| + int flags = 0;
|
| +
|
| + if (modifiers & blink::WebInputEvent::ShiftKey)
|
| + flags |= EF_SHIFT_DOWN;
|
| + if (modifiers & blink::WebInputEvent::ControlKey)
|
| + flags |= EF_CONTROL_DOWN;
|
| + if (modifiers & blink::WebInputEvent::AltKey)
|
| + flags |= EF_ALT_DOWN;
|
| + if (modifiers & blink::WebInputEvent::MetaKey)
|
| + flags |= EF_COMMAND_DOWN;
|
| + if (modifiers & blink::WebInputEvent::CapsLockOn)
|
| + flags |= EF_CAPS_LOCK_ON;
|
| + if (modifiers & blink::WebInputEvent::NumLockOn)
|
| + flags |= EF_NUM_LOCK_ON;
|
| + if (modifiers & blink::WebInputEvent::ScrollLockOn)
|
| + flags |= EF_SCROLL_LOCK_ON;
|
| + if (modifiers & blink::WebInputEvent::LeftButtonDown)
|
| + flags |= EF_LEFT_MOUSE_BUTTON;
|
| + if (modifiers & blink::WebInputEvent::MiddleButtonDown)
|
| + flags |= EF_MIDDLE_MOUSE_BUTTON;
|
| + if (modifiers & blink::WebInputEvent::RightButtonDown)
|
| + flags |= EF_RIGHT_MOUSE_BUTTON;
|
| + if (modifiers & blink::WebInputEvent::IsAutoRepeat)
|
| + flags |= EF_IS_REPEAT;
|
| +
|
| + return flags;
|
| +}
|
| +
|
| +blink::WebInputEvent::Modifiers DomCodeToWebInputEventModifiers(DomCode code) {
|
| + switch (KeycodeConverter::DomCodeToLocation(code)) {
|
| + case DomKeyLocation::LEFT:
|
| + return blink::WebInputEvent::IsLeft;
|
| + case DomKeyLocation::RIGHT:
|
| + return blink::WebInputEvent::IsRight;
|
| + case DomKeyLocation::NUMPAD:
|
| + return blink::WebInputEvent::IsKeyPad;
|
| + case DomKeyLocation::STANDARD:
|
| + break;
|
| + }
|
| + return static_cast<blink::WebInputEvent::Modifiers>(0);
|
| +}
|
| +
|
| } // namespace ui
|
|
|