Upstream Android IME support (ImeAdapter).

content/browser/android/content_view_core_impl.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/android/content_view_core_impl.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
@@ skipping 458 matching lines @@
 
     // Add the item to the list
     Java_ContentViewCore_addToNavigationHistory(env, obj, context, j_url.obj(),
         j_virtual_url.obj(), j_original_url.obj(), j_title.obj(),
         j_bitmap.obj());
   }
 
   return controller.GetCurrentEntryIndex();
 }
 
+int ContentViewCoreImpl::GetNativeImeAdapter(JNIEnv* env, jobject obj) {
+  RenderWidgetHostViewAndroid* rwhva = GetRenderWidgetHostViewAndroid();
+  if (!rwhva)
+    return 0;
+  return rwhva->GetNativeImeAdapter();
+}
+
 // --------------------------------------------------------------------------
 // Methods called from native code
 // --------------------------------------------------------------------------
 
 void ContentViewCoreImpl::LoadUrl(
     NavigationController::LoadURLParams& params) {
   web_contents()->GetController().LoadURLWithParams(params);
   PostLoadUrl(params.url);
 }
 
@@ skipping 21 matching lines @@
 }
 
 // --------------------------------------------------------------------------
 // Public methods that call to Java via JNI
 // --------------------------------------------------------------------------
 
 void ContentViewCoreImpl::OnTabCrashed(const base::ProcessHandle handle) {
   NOTIMPLEMENTED() << "not upstreamed yet";
 }
 
+void ContentViewCoreImpl::ImeUpdateAdapter(int native_ime_adapter,
+                                           int text_input_type,
+                                           const std::string& text,
+                                           int selection_start,
+                                           int selection_end,
+                                           int composition_start,
+                                           int composition_end,
+                                           bool show_ime_if_needed) {
+  JNIEnv* env = AttachCurrentThread();
+  ScopedJavaLocalRef<jobject> obj = java_ref_.get(env);
+  if (obj.is_null())
+    return;
+
+  ScopedJavaLocalRef<jstring> jstring_text = ConvertUTF8ToJavaString(env, text);
+  Java_ContentViewCore_imeUpdateAdapter(env, obj.obj(),
+                                        native_ime_adapter, text_input_type,
+                                        jstring_text.obj(),
+                                        selection_start, selection_end,
+                                        composition_start, composition_end,
+                                        show_ime_if_needed);
+}
+
 void ContentViewCoreImpl::SetTitle(const string16& title) {
   NOTIMPLEMENTED() << "not upstreamed yet";
 }
 
 void ContentViewCoreImpl::ShowSelectPopupMenu(
     const std::vector<WebMenuItem>& items, int selected_item, bool multiple) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> j_obj = java_ref_.get(env);
   if (j_obj.is_null())
     return;
@@ skipping 115 matching lines @@
   if (!HasField(env, clazz, "mNativeContentViewCore", "I")) {
     DLOG(ERROR) << "Unable to find ContentView.mNativeContentViewCore!";
     return false;
   }
   g_native_content_view = GetFieldID(env, clazz, "mNativeContentViewCore", "I");
 
   return RegisterNativesImpl(env) >= 0;
 }
 
 }  // namespace content