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

Unified Diff: third_party/WebKit/Source/core/events/UIEventWithKeyState.cpp

Issue 2646163002: Remove PlatformTouchEvent/Point and use WebTouchEvent/Point instead (Closed)
Patch Set: Fix nit Created 3 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
Index: third_party/WebKit/Source/core/events/UIEventWithKeyState.cpp
diff --git a/third_party/WebKit/Source/core/events/UIEventWithKeyState.cpp b/third_party/WebKit/Source/core/events/UIEventWithKeyState.cpp
index 1e6785e5ffa4860e1a915dbf37e4b48c07bdc0c0..c750261689a82ad3f2c3a8a5bcc3e4644d689ee5 100644
--- a/third_party/WebKit/Source/core/events/UIEventWithKeyState.cpp
+++ b/third_party/WebKit/Source/core/events/UIEventWithKeyState.cpp
@@ -83,25 +83,32 @@ void UIEventWithKeyState::didCreateEventInIsolatedWorld(bool ctrlKey,
void UIEventWithKeyState::setFromPlatformModifiers(
EventModifierInit& initializer,
const PlatformEvent::Modifiers modifiers) {
- if (modifiers & PlatformEvent::CtrlKey)
+ setFromWebInputEventModifiers(
+ initializer, static_cast<WebInputEvent::Modifiers>(modifiers));
+}
+
+void UIEventWithKeyState::setFromWebInputEventModifiers(
+ EventModifierInit& initializer,
+ WebInputEvent::Modifiers modifiers) {
+ if (modifiers & WebInputEvent::ControlKey)
initializer.setCtrlKey(true);
- if (modifiers & PlatformEvent::ShiftKey)
+ if (modifiers & WebInputEvent::ShiftKey)
initializer.setShiftKey(true);
- if (modifiers & PlatformEvent::AltKey)
+ if (modifiers & WebInputEvent::AltKey)
initializer.setAltKey(true);
- if (modifiers & PlatformEvent::MetaKey)
+ if (modifiers & WebInputEvent::MetaKey)
initializer.setMetaKey(true);
- if (modifiers & PlatformEvent::AltGrKey)
+ if (modifiers & WebInputEvent::AltGrKey)
initializer.setModifierAltGraph(true);
- if (modifiers & PlatformEvent::FnKey)
+ if (modifiers & WebInputEvent::FnKey)
initializer.setModifierFn(true);
- if (modifiers & PlatformEvent::CapsLockOn)
+ if (modifiers & WebInputEvent::CapsLockOn)
initializer.setModifierCapsLock(true);
- if (modifiers & PlatformEvent::ScrollLockOn)
+ if (modifiers & WebInputEvent::ScrollLockOn)
initializer.setModifierScrollLock(true);
- if (modifiers & PlatformEvent::NumLockOn)
+ if (modifiers & WebInputEvent::NumLockOn)
initializer.setModifierNumLock(true);
- if (modifiers & PlatformEvent::SymbolKey)
+ if (modifiers & WebInputEvent::SymbolKey)
initializer.setModifierSymbol(true);
}
« no previous file with comments | « third_party/WebKit/Source/core/events/UIEventWithKeyState.h ('k') | third_party/WebKit/Source/core/input/EventHandler.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698