[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 16749dd4891a0d05c71d01d27445235249d1c4f9..4985aa9edb8531403687db25f074292c01e82b3d 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,

[EhsanK, 2016/05/06 18:23:43]

I guess there might be no need for RWHVBase to be the observer now. It should
only be a tab-level RWHV thing.

       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,
@@ -353,6 +354,7 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
 
  private:
   friend class RenderWidgetHostViewAuraCopyRequestTest;
+  friend class TestInputMethodObserver;
   FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest,
                            PopupRetainsCaptureAfterMouseRelease);
   FRIEND_TEST_ALL_PREFIXES(RenderWidgetHostViewAuraTest, SetCompositionText);
@@ -528,6 +530,11 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
   // NULL on failure.
   RenderViewHostDelegateView* GetRenderViewHostDelegateView();
 
+  // TextInputManager::Observer implementations.
+  void OnTextInputStateUpdated(TextInputManager* text_input_manager,
+                               RenderWidgetHostViewBase* updated_view,
+                               bool changed) override;
+
   // The model object.
   RenderWidgetHostImpl* const host_;
 
@@ -571,14 +578,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_;