In TextInputManager, reset input type to none before switching active widgets.

content/browser/renderer_host/text_input_manager.cc

 // Copyright 2016 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/renderer_host/text_input_manager.h"
 
 #include "base/strings/string16.h"
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_base.h"
 #include "content/common/view_messages.h"
@@ skipping 68 matching lines @@
   DCHECK(!view || IsRegistered(view));
   if (!view)
     view = active_view_;
   return !!view ? &text_selection_map_.at(view) : nullptr;
 }
 
 void TextInputManager::UpdateTextInputState(
     RenderWidgetHostViewBase* view,
     const TextInputState& text_input_state) {
   DCHECK(IsRegistered(view));
-
   // Since |view| is registgered, we already have a previous value for its
   // TextInputState.
   bool changed = AreDifferentTextInputStates(text_input_state_map_[view],
                                              text_input_state);
 
   text_input_state_map_[view] = text_input_state;
 
-  // |active_view_| is only updated when the state for |view| is not none.
-  if (text_input_state.type != ui::TEXT_INPUT_TYPE_NONE)
+  // If |view| is different from |active_view| and its |TextInputState.type| is
+  // not NONE, |active_view_| should change to |view|.
+  if (text_input_state.type != ui::TEXT_INPUT_TYPE_NONE &&
+      active_view_ != view) {
+    if (active_view_) {
+      // Ideally, we should always receive an IPC from |active_view_|'s
+      // RenderWidget to reset its |TextInputState.type| to NONE, before any
+      // other RenderWidget updates its TextInputState. But there is no
+      // guarantee in the order of IPCs from different RenderWidges and another

[kenrb, 2016/07/26 20:40:38]

nit: Typo 'RenderWidges'

[EhsanK, 2016/07/26 21:27:56]

Done.

+      // RenderWidget's IPC might arrive sooner and we reach here. To make the
+      // IME behavior identical to the non-OOPIF case, we have to manually reset
+      // the state for |active_view_|.
+      text_input_state_map_[active_view_].type = ui::TEXT_INPUT_TYPE_NONE;
+      RenderWidgetHostViewBase* active_view = active_view_;
+      active_view_ = nullptr;
+      NotifyObserversAboutInputStateUpdate(active_view, true);
+    }
     active_view_ = view;
+  }
 
   // If the state for |active_view_| is none, then we no longer have an
   // |active_view_|.
   if (active_view_ == view && text_input_state.type == ui::TEXT_INPUT_TYPE_NONE)
     active_view_ = nullptr;
 
   NotifyObserversAboutInputStateUpdate(view, changed);
 }
 
 void TextInputManager::ImeCancelComposition(RenderWidgetHostViewBase* view) {
@@ skipping 157 matching lines @@
 
 TextInputManager::TextSelection::TextSelection()
     : offset(0), range(gfx::Range::InvalidRange()), text(base::string16()) {}
 
 TextInputManager::TextSelection::TextSelection(const TextSelection& other) =
     default;
 
 TextInputManager::TextSelection::~TextSelection() {}
 
 }  // namespace content