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..94f3a4ac0be0ed69b6464a0c3b9ae309d5f3992f 100644 |
--- a/content/browser/renderer_host/native_web_keyboard_event_android.cc |
+++ b/content/browser/renderer_host/native_web_keyboard_event_android.cc |
@@ -11,12 +11,12 @@ |
namespace { |
jobject NewGlobalRefForKeyEvent(jobject key_event) { |
- if (key_event == NULL) return NULL; |
+ if (key_event == nullptr) return nullptr; |
return base::android::AttachCurrentThread()->NewGlobalRef(key_event); |
} |
void DeleteGlobalRefForKeyEvent(jobject key_event) { |
- if (key_event != NULL) |
+ if (key_event != nullptr) |
base::android::AttachCurrentThread()->DeleteGlobalRef(key_event); |
} |
@@ -25,30 +25,10 @@ void DeleteGlobalRefForKeyEvent(jobject key_event) { |
namespace content { |
NativeWebKeyboardEvent::NativeWebKeyboardEvent() |
- : os_event(NULL), |
+ : os_event(nullptr), |
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(nullptr), |
+ skip_in_browser(false) { |
+ if (!android_key_event.is_null()) |
+ os_event = NewGlobalRefForKeyEvent(android_key_event.obj()); |
} |
NativeWebKeyboardEvent::NativeWebKeyboardEvent( |