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

Unified Diff: sky/viewer/converters/input_event_types.cc

Issue 872233002: Switch KeyboardEvents over to NewEventHandler (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: nits Created 5 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
« sky/engine/web/WebViewImpl.cpp ('K') | « sky/tests/services/event-sender.sky ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: sky/viewer/converters/input_event_types.cc
diff --git a/sky/viewer/converters/input_event_types.cc b/sky/viewer/converters/input_event_types.cc
index 91748f2ce816f390d241c49d1e65e9a531759a9f..1c8219d0fad76421817d50afc846d90f63d7aea9 100644
--- a/sky/viewer/converters/input_event_types.cc
+++ b/sky/viewer/converters/input_event_types.cc
@@ -182,7 +182,7 @@ scoped_ptr<blink::WebInputEvent> BuildWebKeyboardEvent(
switch (event->action) {
case mojo::EVENT_TYPE_KEY_PRESSED:
web_event->type = event->key_data->is_char ? blink::WebInputEvent::Char :
- blink::WebInputEvent::RawKeyDown;
+ blink::WebInputEvent::KeyDown;
break;
case mojo::EVENT_TYPE_KEY_RELEASED:
web_event->type = blink::WebInputEvent::KeyUp;
@@ -191,15 +191,10 @@ scoped_ptr<blink::WebInputEvent> BuildWebKeyboardEvent(
NOTREACHED();
}
- if (web_event->modifiers & blink::WebInputEvent::AltKey)
- web_event->isSystemKey = true;
+ web_event->virtualKeyCode = event->key_data->windows_key_code;
+ web_event->charCode = event->key_data->text;
+ web_event->unmodifiedCharCode = event->key_data->unmodified_text;
- web_event->windowsKeyCode = event->key_data->windows_key_code;
- web_event->nativeKeyCode = event->key_data->native_key_code;
- web_event->text[0] = event->key_data->text;
- web_event->unmodifiedText[0] = event->key_data->unmodified_text;
-
- web_event->setKeyIdentifierFromWindowsKeyCode();
return web_event.Pass();
}
« sky/engine/web/WebViewImpl.cpp ('K') | « sky/tests/services/event-sender.sky ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698