Upstream Android IME support (ImeAdapter).

content/browser/renderer_host/render_widget_host_view_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/render_widget_host_view_android.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/android/draw_delegate_impl.h"
 #include "content/browser/gpu/gpu_surface_tracker.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/common/android/device_info.h"
 #include "content/common/gpu/gpu_messages.h"
 #include "content/common/view_messages.h"
 
 namespace content {
 
 RenderWidgetHostViewAndroid::RenderWidgetHostViewAndroid(
     RenderWidgetHostImpl* widget_host,
     ContentViewCoreImpl* content_view_core)
     : host_(widget_host),
       // ContentViewCoreImpl represents the native side of the Java
       // ContentViewCore.  It being NULL means that it is not attached to the
       // View system yet, so we treat it as hidden.
       is_hidden_(!content_view_core),
-      content_view_core_(content_view_core) {
+      content_view_core_(content_view_core),
+      ime_adapter_android_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
   host_->SetView(this);
   // RenderWidgetHost is initialized as visible. If is_hidden_ is true, tell
   // RenderWidgetHost to hide.
   if (is_hidden_)
     host_->WasHidden();
 }
 
 RenderWidgetHostViewAndroid::~RenderWidgetHostViewAndroid() {
 }
 
@@ skipping 131 matching lines @@
   // There are no cursors on Android.
 }
 
 void RenderWidgetHostViewAndroid::SetIsLoading(bool is_loading) {
   // Do nothing. The UI notification is handled through ContentViewClient which
   // is TabContentsDelegate.
 }
 
 void RenderWidgetHostViewAndroid::TextInputStateChanged(
     const ViewHostMsg_TextInputState_Params& params) {
-  NOTIMPLEMENTED();
+  if (is_hidden_)
+    return;
+
+  content_view_core_->ImeUpdateAdapter(
+      GetNativeImeAdapter(),
+      static_cast<int>(params.type),
+      params.value, params.selection_start, params.selection_end,
+      params.composition_start, params.composition_end,
+      false /* show_ime_if_needed */);
+}
+
+int RenderWidgetHostViewAndroid::GetNativeImeAdapter() {
+  return reinterpret_cast<int>(&ime_adapter_android_);
 }
 
 void RenderWidgetHostViewAndroid::ImeCancelComposition() {
+  ime_adapter_android_.CancelComposition();
 }
 
 void RenderWidgetHostViewAndroid::DidUpdateBackingStore(
     const gfx::Rect& scroll_rect, int scroll_dx, int scroll_dy,
     const std::vector<gfx::Rect>& copy_rects) {
   NOTIMPLEMENTED();
 }
 
 void RenderWidgetHostViewAndroid::RenderViewGone(
     base::TerminationStatus status, int error_code) {
@@ skipping 135 matching lines @@
 
 bool RenderWidgetHostViewAndroid::LockMouse() {
   NOTIMPLEMENTED();
   return false;
 }
 
 void RenderWidgetHostViewAndroid::UnlockMouse() {
   NOTIMPLEMENTED();
 }
 
+// Methods called from the host to the render
+
+void RenderWidgetHostViewAndroid::SendKeyEvent(
+    const NativeWebKeyboardEvent& event) {
+  if (host_)
+    host_->ForwardKeyboardEvent(event);
+}
+
 void RenderWidgetHostViewAndroid::TouchEvent(
     const WebKit::WebTouchEvent& event) {
   if (host_)
     host_->ForwardTouchEvent(event);
 }
 
 void RenderWidgetHostViewAndroid::GestureEvent(
     const WebKit::WebGestureEvent& event) {
   if (host_)
     host_->ForwardGestureEvent(event);
@@ skipping 35 matching lines @@
 // RenderWidgetHostView, public:
 
 // static
 RenderWidgetHostView*
 RenderWidgetHostView::CreateViewForWidget(RenderWidgetHost* widget) {
   RenderWidgetHostImpl* rwhi = RenderWidgetHostImpl::From(widget);
   return new RenderWidgetHostViewAndroid(rwhi, NULL);
 }
 
 } // namespace content