[Android] Change "handling" of unhandled key events.

content/browser/renderer_host/ime_adapter_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/renderer_host/ime_adapter_android.h"
 
 #include <android/input.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 101 matching lines @@
 }
 
 bool ImeAdapterAndroid::SendKeyEvent(JNIEnv* env, jobject,
                                      jobject original_key_event,
                                      int action, int modifiers,
                                      long time_ms, int key_code,
                                      bool is_system_key, int unicode_char) {
   NativeWebKeyboardEvent event = NativeWebKeyboardEventFromKeyEvent(
           env, original_key_event, action, modifiers,
           time_ms, key_code, is_system_key, unicode_char);
+  bool key_down_text_insertion =
+      event.type == WebKit::WebInputEvent::RawKeyDown && event.text[0];
+  // If we are going to follow up with a synthetic Char event, then that's the
+  // one we expect to test if it's handled or unhandled, so skip handling the
+  // "real" event in the browser.
+  event.skip_in_browser = key_down_text_insertion;
   rwhva_->SendKeyEvent(event);
-  if (event.type == WebKit::WebInputEvent::RawKeyDown && event.text[0]) {
+  if (key_down_text_insertion) {
     // Send a Char event, but without an os_event since we don't want to
     // roundtrip back to java such synthetic event.
     NativeWebKeyboardEvent char_event(event);
     char_event.os_event = NULL;
-    event.type = WebKit::WebInputEvent::Char;
-    rwhva_->SendKeyEvent(event);
+    char_event.type = WebKit::WebInputEvent::Char;
+    rwhva_->SendKeyEvent(char_event);
   }
   return true;
 }
 
 void ImeAdapterAndroid::SetComposingText(JNIEnv* env, jobject, jstring text,
                                          int new_cursor_pos) {
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(
       rwhva_->GetRenderWidgetHost());
   if (!rwhi)
     return;
@@ skipping 124 matching lines @@
     return;
 
   rwhi->Paste();
 }
 
 void ImeAdapterAndroid::ResetImeAdapter(JNIEnv* env, jobject) {
   java_ime_adapter_.reset();
 }
 
 }  // namespace content