Chromium Code Reviews| Index: content/browser/renderer_host/native_web_keyboard_event_android.cc |
| diff --git a/content/browser/renderer_host/native_web_keyboard_event_android.cc b/content/browser/renderer_host/native_web_keyboard_event_android.cc |
| index 696bb0de92048273882848cd5446e7f1395eaa4b..c9ef426c67eeefa232b7cdec9bc32d503f160eef 100644 |
| --- a/content/browser/renderer_host/native_web_keyboard_event_android.cc |
| +++ b/content/browser/renderer_host/native_web_keyboard_event_android.cc |
| @@ -29,26 +29,6 @@ NativeWebKeyboardEvent::NativeWebKeyboardEvent() |
| skip_in_browser(false) { |
| } |
| -NativeWebKeyboardEvent::NativeWebKeyboardEvent(blink::WebInputEvent::Type type, |
| - int modifiers, |
| - double time_secs, |
| - int keycode, |
| - int scancode, |
| - int unicode_character, |
| - bool is_system_key) |
| - : WebKeyboardEvent(WebKeyboardEventBuilder::Build(nullptr, |
| - nullptr, |
| - type, |
| - modifiers, |
| - time_secs, |
| - keycode, |
| - scancode, |
| - unicode_character, |
| - is_system_key)) { |
| - os_event = NULL; |
| - skip_in_browser = false; |
| -} |
| - |
| NativeWebKeyboardEvent::NativeWebKeyboardEvent( |
| JNIEnv* env, |
| const base::android::JavaRef<jobject>& android_key_event, |
| @@ -67,9 +47,11 @@ NativeWebKeyboardEvent::NativeWebKeyboardEvent( |
| keycode, |
| scancode, |
| unicode_character, |
| - is_system_key)) { |
| - os_event = NewGlobalRefForKeyEvent(android_key_event.obj()); |
| - skip_in_browser = false; |
| + is_system_key)), |
| + os_event(NULL), |
|
no sievers
2016/08/08 23:08:51
nit: nullptr here and elsewhere, while you're in h
|
| + skip_in_browser(false) { |
| + if (!android_key_event.is_null()) |
| + os_event = NewGlobalRefForKeyEvent(android_key_event.obj()); |
| } |
| NativeWebKeyboardEvent::NativeWebKeyboardEvent( |