[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 51942cd96d961b17e3b8be7071351206533562de..4493819d6bc99d33c2b16d31fb90d2f2d0b99740 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"
@@ -91,6 +92,7 @@ struct TextInputState;
 class CONTENT_EXPORT RenderWidgetHostViewAura
     : public RenderWidgetHostViewBase,
       public DelegatedFrameHostClient,
+      public TextInputManager::Observer,

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

Nice.  I like that we can be more specific about which RWHV classes observe
TextInputManager.

[EhsanK, 2016/05/30 15:06:08]

My initial intention was to have two classes of observers, or maybe an observer
and a delegate where the observers only track the lifetime and the delegate does
the IME tasks. But this way with proper API to track lifetime and having only
specific RWHV observing this is better since it is more testable than having a
delegate.

       public ui::TextInputClient,
       public display::DisplayObserver,
       public aura::WindowTreeHostObserver,
@@ -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);
@@ -518,6 +520,11 @@ class CONTENT_EXPORT RenderWidgetHostViewAura
   // NULL on failure.
   RenderViewHostDelegateView* GetRenderViewHostDelegateView();
 
+  // TextInputManager::Observer implementation.

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

Style nit: Override declarations always go near the top of the section they're
in.  This should probably go after the DelegatedFrameHostClient overrides above,
around line 457.

[EhsanK, 2016/05/30 15:06:08]

Acknowledged.

+  void OnUpdateTextInputStateCalled(TextInputManager* text_input_manager,
+                                    RenderWidgetHostViewBase* updated_view,
+                                    bool did_update_state) override;
+
   // The model object.
   RenderWidgetHostImpl* const host_;
 
@@ -561,14 +568,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_;