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

content/browser/renderer_host/render_widget_host_view_aura.h

Index: content/browser/renderer_host/render_widget_host_view_aura.h
diff --git a/content/browser/renderer_host/render_widget_host_view_aura.h b/content/browser/renderer_host/render_widget_host_view_aura.h
index ed4520a18d3021adb83426e6318f057dd929f902..c6b0893372f9cbaff98bbba79660ebe924657e43 100644
--- a/content/browser/renderer_host/render_widget_host_view_aura.h
+++ b/content/browser/renderer_host/render_widget_host_view_aura.h
@@ -27,6 +27,7 @@
 #include "content/browser/compositor/owned_mailbox.h"
 #include "content/browser/renderer_host/delegated_frame_host.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
+#include "content/browser/renderer_host/text_input_manager.h"
 #include "content/common/content_export.h"
 #include "content/common/cursors/webcursor.h"
 #include "content/public/common/context_menu_params.h"
@@ -90,6 +91,7 @@ struct TextInputState;
 // RenderWidgetHostView class hierarchy described in render_widget_host_view.h.
 class CONTENT_EXPORT RenderWidgetHostViewAura
     : public RenderWidgetHostViewBase,
+      public TextInputManager::Observer,
       public DelegatedFrameHostClient,
       public ui::TextInputClient,
       public display::DisplayObserver,
@@ -134,7 +136,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
   void Focus() override;
   void UpdateCursor(const WebCursor& cursor) override;
   void SetIsLoading(bool is_loading) override;
-  void TextInputStateChanged(const TextInputState& params) override;
   void ImeCancelComposition() override;
   void ImeCompositionRangeChanged(
       const gfx::Range& range,
@@ -342,6 +343,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
 
  private:
   friend class RenderWidgetHostViewAuraCopyRequestTest;
+  friend class TestInputMethodObserver;
   FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest,
                            PopupRetainsCaptureAfterMouseRelease);
   FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText);
@@ -517,6 +519,16 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
   // NULL on failure.
   RenderViewHostDelegateView* GetRenderViewHostDelegateView();
 
+  // TextInputManager::Observer implementations.

[kenrb, 2016/05/12 16:16:36]

nit: 'implementation' singular not plural

[EhsanK, 2016/05/13 16:00:56]

Done.

+  void OnTextInputStateUpdated(TextInputManager* text_input_manager,
+                               RenderWidgetHostViewBase* updated_view,
+                               bool changed) override;
+
+  // RenderWidgetHostViewAura needs to observe the life time of TextInputManager
+  // as in some cases, RWHV goes away after WebContentsImpl's destruction.

[kenrb, 2016/05/12 16:16:36]

I don't think you need this comment. The comment on the base class method
declaration should be enough, since the override here doesn't have any special
significance. Also you can remove the blank line above this comment.

[EhsanK, 2016/05/13 16:00:55]

Done.

+  void OnTextInputManagerDestroyed(
+      TextInputManager* text_input_manager) override;
+
   // The model object.
   RenderWidgetHostImpl* const host_;
 
@@ -560,14 +572,6 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
   // object.
   ui::MotionEventAura pointer_state_;
 
-  // The current text input type.
-  ui::TextInputType text_input_type_;
-  // The current text input mode corresponding to HTML5 inputmode attribute.
-  ui::TextInputMode text_input_mode_;
-  // The current text input flags.
-  int text_input_flags_;
-  bool can_compose_inline_;
-
   // Bounds for the selection.
   ui::SelectionBound selection_anchor_;
   ui::SelectionBound selection_focus_;