Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(795)

Unified Diff: ui/events/blink/blink_event_util.cc

Issue 1559163002: Clean up event flags a bit: (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comment Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/events/android/motion_event_android.cc ('k') | ui/events/cocoa/cocoa_event_utils.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 ce91f3fd42ba61ededdce5f0df467dd47ede6aa2..108013610d7988134d7f799d1a714310844c0a86 100644
--- a/ui/events/blink/blink_event_util.cc
+++ b/ui/events/blink/blink_event_util.cc
@@ -225,25 +225,24 @@ int EventFlagsToWebEventModifiers(int flags) {
#else
modifiers |= blink::WebInputEvent::MetaKey;
#endif
-
if (flags & EF_ALTGR_DOWN)
modifiers |= blink::WebInputEvent::AltGrKey;
+ if (flags & EF_NUM_LOCK_ON)
+ modifiers |= blink::WebInputEvent::NumLockOn;
+ if (flags & EF_CAPS_LOCK_ON)
+ modifiers |= blink::WebInputEvent::CapsLockOn;
+ if (flags & EF_SCROLL_LOCK_ON)
+ modifiers |= blink::WebInputEvent::ScrollLockOn;
if (flags & EF_LEFT_MOUSE_BUTTON)
modifiers |= blink::WebInputEvent::LeftButtonDown;
if (flags & EF_MIDDLE_MOUSE_BUTTON)
modifiers |= blink::WebInputEvent::MiddleButtonDown;
if (flags & EF_RIGHT_MOUSE_BUTTON)
modifiers |= blink::WebInputEvent::RightButtonDown;
- if (flags & EF_CAPS_LOCK_DOWN)
- modifiers |= blink::WebInputEvent::CapsLockOn;
if (flags & EF_IS_REPEAT)
modifiers |= blink::WebInputEvent::IsAutoRepeat;
- if (flags & ui::EF_TOUCH_ACCESSIBILITY)
+ if (flags & EF_TOUCH_ACCESSIBILITY)
modifiers |= blink::WebInputEvent::IsTouchAccessibility;
- if (flags & ui::EF_NUM_LOCK_DOWN)
- modifiers |= blink::WebInputEvent::NumLockOn;
- if (flags & ui::EF_SCROLL_LOCK_DOWN)
- modifiers |= blink::WebInputEvent::ScrollLockOn;
return modifiers;
}
« no previous file with comments | « ui/events/android/motion_event_android.cc ('k') | ui/events/cocoa/cocoa_event_utils.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698