Let ImeAdapterAndroid have the same lifecycle as its Java peer

content/browser/android/content_view_core_impl.h

 // Copyright 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.
 
 #ifndef CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 #define CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_
 
 #include <stdint.h>
 
 #include <memory>
@@ skipping 31 matching lines @@
 struct MenuItem;
 
 class ContentViewCoreImpl : public ContentViewCore,
                             public WebContentsObserver {
  public:
   static ContentViewCoreImpl* FromWebContents(WebContents* web_contents);
   ContentViewCoreImpl(
       JNIEnv* env,
       const base::android::JavaRef<jobject>& obj,
       WebContents* web_contents,
+      ImeAdapterAndroid* ime_adapter,
       float dpi_scale,
       const base::android::JavaRef<jobject>& java_bridge_retained_object_set);
 
   // ContentViewCore implementation.
   base::android::ScopedJavaLocalRef<jobject> GetJavaObject() override;
   WebContents* GetWebContents() const override;
   ui::WindowAndroid* GetWindowAndroid() const override;
   bool ShowPastePopup(const ContextMenuParams& params) override;
 
   void AddObserver(ContentViewCoreImplObserver* observer);
@@ skipping 104 matching lines @@
                              const base::android::JavaParamRef<jobject>& obj);
   void SetDoubleTapSupportEnabled(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
       jboolean enabled);
   void SetMultiTouchZoomSupportEnabled(
       JNIEnv* env,
       const base::android::JavaParamRef<jobject>& obj,
       jboolean enabled);
 
-  long GetNativeImeAdapter(JNIEnv* env,
-                           const base::android::JavaParamRef<jobject>& obj);
   void SetFocus(JNIEnv* env,
                 const base::android::JavaParamRef<jobject>& obj,
                 jboolean focused);
 
   void SetDIPScale(JNIEnv* env,
                    const base::android::JavaParamRef<jobject>& obj,
                    jfloat dipScale);
 
   jint GetBackgroundColor(JNIEnv* env, jobject obj);
   void SetAllowJavascriptInterfacesInspection(
@@ skipping 72 matching lines @@
   void UpdateFrameInfo(const gfx::Vector2dF& scroll_offset,
                        float page_scale_factor,
                        const gfx::Vector2dF& page_scale_factor_limits,
                        const gfx::SizeF& content_size,
                        const gfx::SizeF& viewport_size,
                        const float top_controls_height,
                        const float top_controls_shown_ratio,
                        bool is_mobile_optimized_hint,
                        const gfx::SelectionBound& selection_start);
 
-  void ForceUpdateImeAdapter(long native_ime_adapter);
-  void UpdateImeAdapter(long native_ime_adapter,
-                        int text_input_type,
+  void UpdateImeAdapter(int text_input_type,
                         int text_input_flags,
                         int text_input_mode,
                         const std::string& text,
                         int selection_start,
                         int selection_end,
                         int composition_start,
                         int composition_end,
                         bool show_ime_if_needed,
                         bool reply_to_request);
 
@@ skipping 43 matching lines @@
   float GetBottomControlsHeightDip() const;
 
   void MoveRangeSelectionExtent(const gfx::PointF& extent);
 
   void SelectBetweenCoordinates(const gfx::PointF& base,
                                 const gfx::PointF& extent);
 
   void OnShowUnhandledTapUIIfNeeded(int x_dip, int y_dip);
   void OnTouchDown(const base::android::ScopedJavaLocalRef<jobject>& event);
 
+  ImeAdapterAndroid* ime_adapter() { return ime_adapter_.get(); }
+
   ui::ViewAndroid* GetViewAndroid() const;
 
  private:
   class ContentViewUserData;
 
   friend class ContentViewUserData;
   ~ContentViewCoreImpl() override;
 
   // WebContentsObserver implementation.
   void RenderViewReady() override;
   void RenderViewHostChanged(RenderViewHost* old_host,
                              RenderViewHost* new_host) override;
+  void DidAttachInterstitialPage() override;
+  void DidDetachInterstitialPage() override;
   void WebContentsDestroyed() override;
 
   // --------------------------------------------------------------------------
   // Other private methods and data
   // --------------------------------------------------------------------------
 
   void InitWebContents();
   void SendScreenRectsAndResizeWidget();
 
   RenderWidgetHostViewAndroid* GetRenderWidgetHostViewAndroid() const;
@@ skipping 20 matching lines @@
   // A weak reference to the Java ContentViewCore object.
   JavaObjectWeakGlobalRef java_ref_;
 
   // Select popup view
   ui::ViewAndroid::ScopedAnchorView select_popup_;
 
   // Reference to the current WebContents used to determine how and what to
   // display in the ContentViewCore.
   WebContentsImpl* web_contents_;
 
+  std::unique_ptr<ImeAdapterAndroid> ime_adapter_;
+
   // Page scale factor.
   float page_scale_;
 
   // Device scale factor.
   float dpi_scale_;
 
+  // The active RenderWidgetHostViewAndroid that is attached to IME adapter
+  // instance. Can also point to interstitial page if one is showing.
+  RenderWidgetHostViewAndroid* active_rwhva_;
+
   // Observer to notify of lifecyle changes.
   base::ObserverList<ContentViewCoreImplObserver> observer_list_;
 
   // The cache of device's current orientation set from Java side, this value
   // will be sent to Renderer once it is ready.
   int device_orientation_;
 
   bool accessibility_enabled_;
 
   // Manages injecting Java objects.
   scoped_refptr<GinJavaBridgeDispatcherHost> java_bridge_dispatcher_host_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentViewCoreImpl);
 };
 
 bool RegisterContentViewCore(JNIEnv* env);
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_ANDROID_CONTENT_VIEW_CORE_IMPL_H_