Factor out RenderWidgetHostConnector

content/browser/android/ime_adapter_android.cc

 // Copyright 2017 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/ime_adapter_android.h"
 
 #include <android/input.h>
 #include <algorithm>
 #include <vector>
 
 #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"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
-#include "content/browser/frame_host/interstitial_page_impl.h"
 #include "content/browser/frame_host/render_frame_host_impl.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_android.h"
-#include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/input_messages.h"
 #include "content/common/view_messages.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 #include "content/public/browser/web_contents.h"
 #include "jni/ImeAdapter_jni.h"
 #include "third_party/WebKit/public/platform/WebInputEvent.h"
 #include "third_party/WebKit/public/platform/WebTextInputType.h"
 #include "third_party/WebKit/public/web/WebCompositionUnderline.h"
 
@@ skipping 75 matching lines @@
       reinterpret_cast<std::vector<blink::WebCompositionUnderline>*>(
           underlines_ptr);
   underlines->push_back(blink::WebCompositionUnderline(
       static_cast<unsigned>(start), static_cast<unsigned>(end), SK_ColorBLACK,
       false, SK_ColorTRANSPARENT));
 }
 
 ImeAdapterAndroid::ImeAdapterAndroid(JNIEnv* env,
                                      const JavaParamRef<jobject>& obj,
                                      WebContents* web_contents)
-    : WebContentsObserver(web_contents), rwhva_(nullptr) {
+    : connector_(new Connector(web_contents, this)), rwhva_(nullptr) {
   java_ime_adapter_ = JavaObjectWeakGlobalRef(env, obj);
 }
 
 ImeAdapterAndroid::~ImeAdapterAndroid() {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ime_adapter_.get(env);
   if (!obj.is_null())
     Java_ImeAdapter_destroy(env, obj);
-
-  UpdateRenderProcessConnection(nullptr);
 }
 
-RenderWidgetHostViewAndroid* ImeAdapterAndroid::GetRenderWidgetHostViewAndroid()
-    const {
-  RenderWidgetHostView* rwhv = web_contents()->GetRenderWidgetHostView();
-  WebContentsImpl* web_contents_impl =
-      static_cast<WebContentsImpl*>(web_contents());
-  if (web_contents_impl->ShowingInterstitialPage()) {
-    rwhv = web_contents_impl->GetInterstitialPage()
-               ->GetMainFrame()
-               ->GetRenderViewHost()
-               ->GetWidget()
-               ->GetView();
-  }
-  return static_cast<RenderWidgetHostViewAndroid*>(rwhv);
-}
+// ImeAdapterAndroid::Connector methods
 
-void ImeAdapterAndroid::RenderViewReady() {
-  UpdateRenderProcessConnection(GetRenderWidgetHostViewAndroid());
+ImeAdapterAndroid::Connector::Connector(WebContents* web_contents,
+                                        ImeAdapterAndroid* ime_adapter)
+    : RenderWidgetHostConnector(web_contents), ime_adapter_(ime_adapter) {}
 
-  JNIEnv* env = AttachCurrentThread();
-  ScopedJavaLocalRef<jobject> obj = java_ime_adapter_.get(env);
-  if (!obj.is_null())
-    Java_ImeAdapter_onConnectedToRenderProcess(env, obj);
-}
-
-void ImeAdapterAndroid::RenderViewHostChanged(RenderViewHost* old_host,
-                                              RenderViewHost* new_host) {
-  if (new_host) {
-    UpdateRenderProcessConnection(static_cast<RenderWidgetHostViewAndroid*>(
-        new_host->GetWidget()->GetView()));
-  } else {
-    UpdateRenderProcessConnection(nullptr);
+void ImeAdapterAndroid::Connector::UpdateRenderWidgetHostView(
+    RenderWidgetHostViewAndroid* old_rwhva,
+    RenderWidgetHostViewAndroid* new_rwhva) {
+  if (old_rwhva)
+    old_rwhva->set_ime_adapter(nullptr);
+  if (new_rwhva) {
+    new_rwhva->set_ime_adapter(ime_adapter_);
+    ime_adapter_->SetRenderWidgetHostView(new_rwhva);
   }
 }
 
-void ImeAdapterAndroid::DidAttachInterstitialPage() {
-  UpdateRenderProcessConnection(GetRenderWidgetHostViewAndroid());
-}
-
-void ImeAdapterAndroid::DidDetachInterstitialPage() {
-  UpdateRenderProcessConnection(GetRenderWidgetHostViewAndroid());
-}
-
-void ImeAdapterAndroid::WebContentsDestroyed() {
-  delete this;
-}
-
-void ImeAdapterAndroid::UpdateRenderProcessConnection(
-    RenderWidgetHostViewAndroid* new_rwhva) {
-  if (rwhva_.get() == new_rwhva)
+void ImeAdapterAndroid::SetRenderWidgetHostView(
+    RenderWidgetHostViewAndroid* rwhva) {
+  if (rwhva_ == rwhva)
     return;
-  if (rwhva_)
-    rwhva_->set_ime_adapter(nullptr);
-  if (new_rwhva) {
-    new_rwhva->set_ime_adapter(this);
-    rwhva_ = new_rwhva->GetWeakPtrAndroid();
-  } else {
-    rwhva_.reset();
+  if (!rwhva_ && rwhva) {
+    JNIEnv* env = AttachCurrentThread();
+    ScopedJavaLocalRef<jobject> obj = java_ime_adapter_.get(env);
+    if (!obj.is_null())
+      Java_ImeAdapter_onConnectedToRenderProcess(env, obj);
   }
+  rwhva_ = rwhva;
 }
 
 void ImeAdapterAndroid::UpdateState(const TextInputState& state) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> obj = java_ime_adapter_.get(env);
   if (obj.is_null())
     return;
 
   ScopedJavaLocalRef<jstring> jstring_text =
       ConvertUTF8ToJavaString(env, state.value);
@@ skipping 235 matching lines @@
   Java_ImeAdapter_populateUnderlinesFromSpans(
       env, obj, text, reinterpret_cast<jlong>(&underlines));
 
   // Sort spans by |.startOffset|.
   std::sort(underlines.begin(), underlines.end());
 
   return underlines;
 }
 
 }  // namespace content