Revert of Let ImeAdapterAndroid have the same lifecycle as its Java peer

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 23 matching lines @@
 #include "cc/resources/single_release_callback.h"
 #include "cc/surfaces/surface.h"
 #include "cc/surfaces/surface_factory.h"
 #include "cc/surfaces/surface_hittest.h"
 #include "cc/surfaces/surface_manager.h"
 #include "cc/trees/layer_tree_host.h"
 #include "components/display_compositor/gl_helper.h"
 #include "content/browser/accessibility/browser_accessibility_manager_android.h"
 #include "content/browser/android/composited_touch_handle_drawable.h"
 #include "content/browser/android/content_view_core_impl.h"
-#include "content/browser/android/ime_adapter_android.h"
 #include "content/browser/android/overscroll_controller_android.h"
 #include "content/browser/android/synchronous_compositor_host.h"
 #include "content/browser/compositor/surface_utils.h"
 #include "content/browser/devtools/render_frame_devtools_agent_host.h"
 #include "content/browser/gpu/browser_gpu_channel_host_factory.h"
 #include "content/browser/gpu/compositor_util.h"
 #include "content/browser/gpu/gpu_data_manager_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
 #include "content/browser/media/android/media_web_contents_observer_android.h"
 #include "content/browser/renderer_host/compositor_impl_android.h"
@@ skipping 389 matching lines @@
       begin_frame_source_(nullptr),
       latest_confirmed_begin_frame_source_id_(0),
       latest_confirmed_begin_frame_sequence_number_(
           cc::BeginFrameArgs::kInvalidFrameNumber),
       outstanding_begin_frame_requests_(0),
       is_showing_(!widget_host->is_hidden()),
       is_window_visible_(true),
       is_window_activity_started_(true),
       is_in_vr_(false),
       content_view_core_(nullptr),
-      ime_adapter_android_(nullptr),
+      ime_adapter_android_(this),
       cached_background_color_(SK_ColorWHITE),
       view_(this),
       gesture_provider_(ui::GetGestureProviderConfig(
                             ui::GestureProviderConfigType::CURRENT_PLATFORM),
                         this),
       stylus_text_selector_(this),
       using_browser_compositor_(CompositorImpl::IsInitialized()),
       synchronous_compositor_client_(nullptr),
       frame_evictor_(new DelegatedFrameEvictor(this)),
       observing_root_window_(false),
@@ skipping 25 matching lines @@
   CreateOverscrollControllerIfPossible();
 
   if (GetTextInputManager())
     GetTextInputManager()->AddObserver(this);
 }
 
 RenderWidgetHostViewAndroid::~RenderWidgetHostViewAndroid() {
   if (content_view_core_)
     content_view_core_->RemoveObserver(this);
   SetContentViewCore(NULL);
-  ime_adapter_android_ = nullptr;
   DCHECK(ack_callbacks_.empty());
   DCHECK(!delegated_frame_host_);
 }
 
 void RenderWidgetHostViewAndroid::Blur() {
   host_->Blur();
   if (overscroll_controller_)
     overscroll_controller_->Disable();
 }
 
@@ skipping 187 matching lines @@
 
 void RenderWidgetHostViewAndroid::UpdateCursor(const WebCursor& cursor) {
   // There are no cursors on Android.
 }
 
 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_);
+}
+
 // -----------------------------------------------------------------------------
 // TextInputManager::Observer implementations.
 void RenderWidgetHostViewAndroid::OnUpdateTextInputStateCalled(
     TextInputManager* text_input_manager,
     RenderWidgetHostViewBase* updated_view,
     bool did_change_state) {
   DCHECK_EQ(text_input_manager_, text_input_manager);
   // If there are no active widgets, the TextInputState.type should be reported
   // as none.
   const TextInputState& state =
       GetTextInputManager()->GetActiveWidget()
           ? *GetTextInputManager()->GetTextInputState()
           : TextInputState();
 
   if (!content_view_core_ || is_in_vr_)
     return;
 
   content_view_core_->UpdateImeAdapter(
-      static_cast<int>(state.type), state.flags, state.mode, state.value,
-      state.selection_start, state.selection_end, state.composition_start,
-      state.composition_end, state.show_ime_if_needed, state.reply_to_request);
+      GetNativeImeAdapter(), static_cast<int>(state.type), state.flags,
+      state.mode, state.value, state.selection_start, state.selection_end,
+      state.composition_start, state.composition_end, state.show_ime_if_needed,
+      state.reply_to_request);
 }
 
 void RenderWidgetHostViewAndroid::OnImeCompositionRangeChanged(
     TextInputManager* text_input_manager,
     RenderWidgetHostViewBase* updated_view) {
   DCHECK_EQ(text_input_manager_, text_input_manager);
   const TextInputManager::CompositionRangeInfo* info =
       text_input_manager_->GetCompositionRangeInfo();
   if (!info)
     return;
 
   std::vector<gfx::RectF> character_bounds;
   for (const gfx::Rect& rect : info->character_bounds)
     character_bounds.emplace_back(rect);
 
-  if (ime_adapter_android_)
-    ime_adapter_android_->SetCharacterBounds(character_bounds);
+  ime_adapter_android_.SetCharacterBounds(character_bounds);
 }
 
 void RenderWidgetHostViewAndroid::OnImeCancelComposition(
     TextInputManager* text_input_manager,
     RenderWidgetHostViewBase* updated_view) {
   DCHECK_EQ(text_input_manager_, text_input_manager);
-  if (ime_adapter_android_)
-    ime_adapter_android_->CancelComposition();
+  ime_adapter_android_.CancelComposition();
 }
 
 void RenderWidgetHostViewAndroid::OnTextSelectionChanged(
     TextInputManager* text_input_manager,
     RenderWidgetHostViewBase* updated_view) {
   DCHECK_EQ(text_input_manager_, text_input_manager);
 
   // TODO(asimjour): remove the flag and fix text selection popup for
   // virtual reality mode.
   if (is_in_vr_)
@@ skipping 232 matching lines @@
 }
 
 void RenderWidgetHostViewAndroid::SetMultiTouchZoomSupportEnabled(
     bool enabled) {
   gesture_provider_.SetMultiTouchZoomSupportEnabled(enabled);
 }
 
 void RenderWidgetHostViewAndroid::FocusedNodeChanged(
     bool is_editable_node,
     const gfx::Rect& node_bounds_in_screen) {
-  if (ime_adapter_android_)
-    ime_adapter_android_->FocusedNodeChanged(is_editable_node);
+  ime_adapter_android_.FocusedNodeChanged(is_editable_node);
 }
 
 void RenderWidgetHostViewAndroid::RenderProcessGone(
     base::TerminationStatus status, int error_code) {
   Destroy();
 }
 
 void RenderWidgetHostViewAndroid::Destroy() {
   host_->ViewDestroyed();
   SetContentViewCore(NULL);
@@ skipping 1141 matching lines @@
 
   ui::WindowAndroidCompositor* compositor = window_android->GetCompositor();
   if (!compositor)
     return;
 
   overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>(
       overscroll_refresh_handler, compositor, view_.GetDipScale());
 }
 
 }  // namespace content