Support DomCode on Android devices.

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 <algorithm>
 #include <android/input.h>
 #include <vector>
 
@@ skipping 32 matching lines @@
 // type, |modifiers|, |time_ms|, |key_code|, |unicode_char| is used to create
 // WebKeyboardEvent. |key_code| is also needed ad need to treat the enter key
 // as a key press of character \r.
 NativeWebKeyboardEvent NativeWebKeyboardEventFromKeyEvent(
     JNIEnv* env,
     jobject java_key_event,
     int action,
     int modifiers,
     long time_ms,
     int key_code,
+    int scan_code,
     bool is_system_key,
     int unicode_char) {
   blink::WebInputEvent::Type type = blink::WebInputEvent::Undefined;
   if (action == AKEY_EVENT_ACTION_DOWN)
     type = blink::WebInputEvent::RawKeyDown;
   else if (action == AKEY_EVENT_ACTION_UP)
     type = blink::WebInputEvent::KeyUp;
   else
     NOTREACHED() << "Invalid Android key event action: " << action;
   return NativeWebKeyboardEvent(java_key_event, type, modifiers,
-      time_ms / 1000.0, key_code, unicode_char, is_system_key);
+      time_ms / 1000.0, key_code, scan_code, unicode_char, is_system_key);
 }
 
 }  // anonymous namespace
 
 bool RegisterImeAdapter(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // Callback from Java to convert BackgroundColorSpan data to a
 // blink::WebCompositionUnderline instance, and append it to |underlines_ptr|.
@@ skipping 49 matching lines @@
 }
 
 bool ImeAdapterAndroid::SendSyntheticKeyEvent(JNIEnv*,
                                               jobject,
                                               int type,
                                               long time_ms,
                                               int key_code,
                                               int modifiers,
                                               int text) {
   NativeWebKeyboardEvent event(static_cast<blink::WebInputEvent::Type>(type),
-                               modifiers, time_ms / 1000.0, key_code,
+                               modifiers, time_ms / 1000.0, key_code, 0,
                                text, false /* is_system_key */);
   rwhva_->SendKeyEvent(event);
   return true;
 }
 
 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) {
+                                     int scan_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);
+          time_ms, key_code, scan_code, is_system_key, unicode_char);
   bool key_down_text_insertion =
       event.type == blink::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 (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(blink::WebInputEvent::Char, modifiers,
-                                      time_ms / 1000.0, key_code, unicode_char,
+                                      time_ms / 1000.0, key_code, scan_code,
+                                      unicode_char,
                                       is_system_key);
     char_event.skip_in_browser = key_down_text_insertion;
     rwhva_->SendKeyEvent(char_event);
   }
   return true;
 }
 
 void ImeAdapterAndroid::SetComposingText(JNIEnv* env,
                                          jobject obj,
                                          jobject text,
@@ skipping 132 matching lines @@
 WebContents* ImeAdapterAndroid::GetWebContents() {
   RenderWidgetHostImpl* rwh = GetRenderWidgetHostImpl();
   if (!rwh)
     return NULL;
   if (!rwh->IsRenderView())
     return NULL;
   return WebContents::FromRenderViewHost(RenderViewHost::From(rwh));
 }
 
 }  // namespace content