[reland] Browser Side Text Input State Tracking for OOPIF (Aura Only)

content/browser/renderer_host/render_widget_host_view_base.cc

Index: content/browser/renderer_host/render_widget_host_view_base.cc
diff --git a/content/browser/renderer_host/render_widget_host_view_base.cc b/content/browser/renderer_host/render_widget_host_view_base.cc
index dd88faea8fae27b0cfc71207869e299227a5a363..26609a6ffdef6ea09b613070b8d05655b91f6497 100644
--- a/content/browser/renderer_host/render_widget_host_view_base.cc
+++ b/content/browser/renderer_host/render_widget_host_view_base.cc
@@ -13,6 +13,7 @@
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base_observer.h"
+#include "content/browser/renderer_host/text_input_manager.h"
 #include "content/common/content_switches_internal.h"
 #include "content/public/browser/render_widget_host_view_frame_subscriber.h"
 #include "ui/display/display.h"
@@ -40,6 +41,7 @@ RenderWidgetHostViewBase::RenderWidgetHostViewBase()
       current_device_scale_factor_(0),
       current_display_rotation_(display::Display::ROTATE_0),
       pinch_zoom_enabled_(content::IsPinchToZoomEnabled()),
+      text_input_manager_(nullptr),
       renderer_frame_number_(0),
       weak_factory_(this) {}
 
@@ -382,6 +384,32 @@ void RenderWidgetHostViewBase::TransformPointToLocalCoordSpace(
   *transformed_point = point;
 }
 
+void RenderWidgetHostViewBase::TextInputStateChanged(
+    const TextInputState& text_input_state) {
+  if (GetTextInputManager())
+    GetTextInputManager()->UpdateTextInputState(this, text_input_state);
+}
+
+TextInputManager* RenderWidgetHostViewBase::GetTextInputManager() {
+  if (text_input_manager_)
+    return text_input_manager_;
+
+  RenderWidgetHostImpl* host =
+      RenderWidgetHostImpl::From(GetRenderWidgetHost());
+  if (!host || !host->delegate())
+    return nullptr;
+
+  // This RWHV needs to be registered with the TextInputManager so that the
+  // TextInputManager starts observing its lifetime.
+  text_input_manager_ = host->delegate()->GetTextInputManager();
+  if (text_input_manager_) {
+    text_input_manager_->Register(this);
+    text_input_manager_->AddObserver(this);

[Charlie Reis, 2016/05/18 20:46:03]

Would it make sense to call TextInputManager::AddObserver from within Register,
or are there cases when we want to register without observing?

[EhsanK, 2016/05/24 20:42:44]

For testing purposes, we just want to observe and not register.

Also, we register to update TextInputManager with state, but we observe it to
get updates about state change, ime stuff, etc. So observing and registering
should be done separately.

Nonetheless, following the comment on line 24 of 'text_input_manager.h', I have
now removed the inheritance of RWHVBase from TextInputManager::Observer. So now
we only call Register here and the observing part is left with RWHVAura.

[Charlie Reis, 2016/05/26 06:22:03]

Acknowledged.

+  }
+
+  return text_input_manager_;
+}
+
 void RenderWidgetHostViewBase::AddObserver(
     RenderWidgetHostViewBaseObserver* observer) {
   observers_.AddObserver(observer);
@@ -400,4 +428,14 @@ cc::SurfaceId RenderWidgetHostViewBase::SurfaceIdForTesting() const {
   return cc::SurfaceId();
 }
 
+void RenderWidgetHostViewBase::OnDestroyingTextInputManager(
+    TextInputManager* text_input_manager) {
+  DCHECK(text_input_manager && text_input_manager_ == text_input_manager);
+
+  if (text_input_manager_->IsRegisteredView(this))
+    text_input_manager_->Unregister(this);
+  text_input_manager_->RemoveObserver(this);

[Charlie Reis, 2016/05/18 20:46:03]

Seems a bit unusual to have the observer reach back into the TextInputManager to
clear this state, rather than having the TextInputManager handle it directly in
its destructor.  Maybe it would be better to just do clear text_input_manager_
here (with the DCHECK above) and clear the rest in ~TextInputManager?

[EhsanK, 2016/05/24 20:42:44]

Acknowledged. However, I removed this method and added a new method which
basically does the same thing. However, now the RWHVBase does not need to
observer TextInputManager which is good since most of its methods (in future)
will be IME related and only tab's RWHV should observe them (also tests).

The new method is called 'DidUnregisterFromTextInputManager'.

[Charlie Reis, 2016/05/26 06:22:03]

Acknowledged.

+  text_input_manager_ = nullptr;
+}
+
 }  // namespace content