Browser Side TextInputState Tracking for Android

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 <android/bitmap.h>
 
 #include <utility>
 
@@ skipping 448 matching lines @@
   view_.SetLayer(cc::Layer::Create());
   if (using_browser_compositor_) {
     delegated_frame_host_.reset(new ui::DelegatedFrameHostAndroid(
         &view_, cached_background_color_,
         base::Bind(&RenderWidgetHostViewAndroid::ReturnResources,
                    weak_ptr_factory_.GetWeakPtr())));
   }
 
   host_->SetView(this);
   SetContentViewCore(content_view_core);
+
+  if (GetTextInputManager())
+    GetTextInputManager()->AddObserver(this);
 }
 
 RenderWidgetHostViewAndroid::~RenderWidgetHostViewAndroid() {
   if (content_view_core_)
     content_view_core_->RemoveObserver(this);
   SetContentViewCore(NULL);
   DCHECK(ack_callbacks_.empty());
   DCHECK(!delegated_frame_host_);
 }
 
@@ skipping 275 matching lines @@
 
 void RenderWidgetHostViewAndroid::SetIsLoading(bool is_loading) {
   // Do nothing. The UI notification is handled through ContentViewClient which
   // is TabContentsDelegate.
 }
 
 long RenderWidgetHostViewAndroid::GetNativeImeAdapter() {
   return reinterpret_cast<intptr_t>(&ime_adapter_android_);
 }
 
-void RenderWidgetHostViewAndroid::TextInputStateChanged(
-    const TextInputState& params) {
-  if (params.is_non_ime_change) {
+// -----------------------------------------------------------------------------
+// TextInputManager::Observer implementations.
+void RenderWidgetHostViewAndroid::OnUpdateTextInputStateCalled(
+    TextInputManager* text_input_manager,
+    RenderWidgetHostViewBase* updated_view,
+    bool did_change_state) {
+  const TextInputState& state =
+      *GetTextInputManager()->GetTextInputState(updated_view);
+  if (state.is_non_ime_change && updated_view->GetRenderWidgetHost()) {
     // Sends an acknowledgement to the renderer of a processed IME event.
-    host_->Send(new InputMsg_ImeEventAck(host_->GetRoutingID()));
+    updated_view->GetRenderWidgetHost()->Send(
+        new InputMsg_ImeEventAck(host_->GetRoutingID()));
   }
 
   if (!content_view_core_)
     return;
 
   content_view_core_->UpdateImeAdapter(
       GetNativeImeAdapter(),
-      static_cast<int>(params.type), params.flags,
-      params.value, params.selection_start, params.selection_end,
-      params.composition_start, params.composition_end,
-      params.show_ime_if_needed, params.is_non_ime_change,
-      params.batch_edit);
+      static_cast<int>(state.type), state.flags,
+      state.value, state.selection_start, state.selection_end,
+      state.composition_start, state.composition_end,
+      state.show_ime_if_needed, state.is_non_ime_change,
+      state.batch_edit);
 }
 
 void RenderWidgetHostViewAndroid::UpdateBackgroundColor(SkColor color) {
   if (cached_background_color_ == color)
     return;
 
   cached_background_color_ = color;
 
   if (delegated_frame_host_)
     delegated_frame_host_->UpdateBackgroundColor(color);
@@ skipping 133 matching lines @@
 }
 
 void RenderWidgetHostViewAndroid::Destroy() {
   host_->ViewDestroyed();
   SetContentViewCore(NULL);
   delegated_frame_host_.reset();
 
   // The RenderWidgetHost's destruction led here, so don't call it.
   host_ = NULL;
 
+  if (GetTextInputManager() && GetTextInputManager()->HasObserver(this))
+    GetTextInputManager()->RemoveObserver(this);
+
   delete this;
 }
 
 void RenderWidgetHostViewAndroid::SetTooltipText(
     const base::string16& tooltip_text) {
   // Tooltips don't makes sense on Android.
 }
 
 void RenderWidgetHostViewAndroid::SelectionChanged(const base::string16& text,
                                                    size_t offset,
@@ skipping 1046 matching lines @@
     case ui::MotionEvent::ACTION_UP:
     case ui::MotionEvent::ACTION_POINTER_UP:
       UMA_HISTOGRAM_CUSTOM_COUNTS("Event.Latency.OS.TOUCH_RELEASED",
                                   delta.InMicroseconds(), 1, 1000000, 50);
     default:
       return;
   }
 }
 
 }  // namespace content