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

Unified Diff: content/browser/renderer_host/input/web_input_event_builders_android.cc

Issue 2573073003: Collapse the API surface on WebInputEvent via accessor functions. (Closed)
Patch Set: Fix nits 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: content/browser/renderer_host/input/web_input_event_builders_android.cc
diff --git a/content/browser/renderer_host/input/web_input_event_builders_android.cc b/content/browser/renderer_host/input/web_input_event_builders_android.cc
index afffca048275515d0f8312ab5e85f9b85d905948..9bdd73f84681228728bbec6930621f7bde9c6365 100644
--- a/content/browser/renderer_host/input/web_input_event_builders_android.cc
+++ b/content/browser/renderer_host/input/web_input_event_builders_android.cc
@@ -83,14 +83,16 @@ WebKeyboardEvent WebKeyboardEventBuilder::Build(
int unicode_character,
bool is_system_key) {
DCHECK(WebInputEvent::isKeyboardEventType(type));
- WebKeyboardEvent result(type, modifiers, time_sec);
ui::DomCode dom_code = ui::DomCode::NONE;
if (scancode)
dom_code = ui::KeycodeConverter::NativeKeycodeToDomCode(scancode);
+
+ WebKeyboardEvent result(
+ type, modifiers | ui::DomCodeToWebInputEventModifiers(dom_code),
+ time_sec);
result.windowsKeyCode = ui::LocatedToNonLocatedKeyboardCode(
ui::KeyboardCodeFromAndroidKeyCode(keycode));
- result.modifiers |= ui::DomCodeToWebInputEventModifiers(dom_code);
result.nativeKeyCode = keycode;
result.domCode = static_cast<int>(dom_code);
result.domKey = GetDomKeyFromEvent(env, android_key_event, keycode, modifiers,

Powered by Google App Engine
This is Rietveld 408576698