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

Unified Diff: webkit/plugins/ppapi/event_conversion.cc

Issue 9353013: Add GetUsbKeyCode dev interface for Pepper key events (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Auto-set PP_INPUTEVENT_CLASS_KEYBOARD Created 8 years, 10 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: webkit/plugins/ppapi/event_conversion.cc
diff --git a/webkit/plugins/ppapi/event_conversion.cc b/webkit/plugins/ppapi/event_conversion.cc
index d78ad3916a76032e6e2f0a6811b127bfe40c3348..a4d0501c6a0b89874d6ac84cc4945b8472a97bf8 100644
--- a/webkit/plugins/ppapi/event_conversion.cc
+++ b/webkit/plugins/ppapi/event_conversion.cc
@@ -75,12 +75,18 @@ InputEventData GetEventWithCommonFieldsAndType(const WebInputEvent& web_event) {
}
void AppendKeyEvent(const WebInputEvent& event,
+ bool lowlevel_keyboard_events,
std::vector<InputEventData>* result_events) {
const WebKeyboardEvent& key_event =
static_cast<const WebKeyboardEvent&>(event);
InputEventData result = GetEventWithCommonFieldsAndType(event);
result.event_modifiers = key_event.modifiers;
- result.key_code = key_event.windowsKeyCode;
+ if (lowlevel_keyboard_events) {
+ // TODO(garykac) Convert native key code to USB scancodes.
+ result.key_code = key_event.nativeKeyCode;
+ } else {
+ result.key_code = key_event.windowsKeyCode;
+ }
result_events->push_back(result);
}
@@ -339,6 +345,7 @@ void GetKeyCode(const std::string& char_text,
} // namespace
void CreateInputEventData(const WebInputEvent& event,
+ bool lowlevel_keyboard_events,
std::vector<InputEventData>* result) {
result->clear();
@@ -357,7 +364,7 @@ void CreateInputEventData(const WebInputEvent& event,
case WebInputEvent::RawKeyDown:
case WebInputEvent::KeyDown:
case WebInputEvent::KeyUp:
- AppendKeyEvent(event, result);
+ AppendKeyEvent(event, lowlevel_keyboard_events, result);
break;
case WebInputEvent::Char:
AppendCharEvent(event, result);

Powered by Google App Engine
This is Rietveld 408576698