Browser Side TextInputState Tracking for Android

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"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/range/range.h"
 
 namespace content {
 
 namespace {
 
-bool AreDifferentTextInputStates(const content::TextInputState& old_state,
+bool ShouldUpdateTextInputState(const content::TextInputState& old_state,
                                  const content::TextInputState& new_state) {
 #if defined(USE_AURA)
   return old_state.type != new_state.type || old_state.mode != new_state.mode ||
          old_state.flags != new_state.flags ||
          old_state.can_compose_inline != new_state.can_compose_inline;
 #elif defined(OS_MACOSX)
   return old_state.type != new_state.type ||
          old_state.can_compose_inline != new_state.can_compose_inline;
 #else

[Shu Chen, 2016/11/21 02:10:53]

Can you please add #elif defined(OS_ANDROID) for this?
And "NOTREACHED();" for #else for other platforms?

[EhsanK, 2016/11/21 20:44:21]

Acknowledged and done. Although I am not sure what platform would be neither
Aura, Mac, or Android and for that platform, what is the best fallback behavior
(return false or true?).

[Charlie Reis, 2016/11/23 23:27:21]

If you really don't want it to be handled, you can put #error so it won't
compile.  But I think there will be other corner case platforms that don't fall
into these buckets.  (I don't know much about Ozone, for example.)  I think it's
fine to just pick a value for now, since people on that platform will have to
decide when they hit your NOTREACHED.

[EhsanK, 2016/11/24 03:59:45]

Acknowledged.

-  // TODO(ekaramad): Implement the logic for other platforms (crbug.com/578168).
-  NOTREACHED();
+  // On Android, TextInputState update is sent only if there is some change in
+  // the state. So the new state is always different.
   return true;
 #endif
 }
 
 }  // namespace
 
 TextInputManager::TextInputManager() : active_view_(nullptr) {}
 
 TextInputManager::~TextInputManager() {
   // If there is an active view, we should unregister it first so that the
@@ skipping 10 matching lines @@
   for (auto* view : views)
     Unregister(view);
 }
 
 RenderWidgetHostImpl* TextInputManager::GetActiveWidget() const {
   return !!active_view_ ? static_cast<RenderWidgetHostImpl*>(
                               active_view_->GetRenderWidgetHost())
                         : nullptr;
 }
 
-const TextInputState* TextInputManager::GetTextInputState() const {
-  return !!active_view_ ? &text_input_state_map_.at(active_view_) : nullptr;
+const TextInputState* TextInputManager::GetTextInputState(
+    RenderWidgetHostViewBase* view) const {
+  DCHECK(!view || IsRegistered(view));
+  if (!view)
+    view = active_view_;
+  return !!view ? &text_input_state_map_.at(view) : nullptr;
 }
 
 const TextInputManager::SelectionRegion* TextInputManager::GetSelectionRegion(
     RenderWidgetHostViewBase* view) const {
   DCHECK(!view || IsRegistered(view));
   if (!view)
     view = active_view_;
   return view ? &selection_region_map_.at(view) : nullptr;
 }
 
@@ skipping 26 matching lines @@
     // one other view has become active and we have received the corresponding
     // IPC from their RenderWidget sooner than this one. That also means we have
     // already synthesized the loss of TextInputState for the |view| before (see
     // below). So we can forget about this method ever being called (no observer
     // calls necessary).
     return;
   }
 
   // Since |view| is registered, we already have a previous value for its
   // TextInputState.
-  bool changed = AreDifferentTextInputStates(text_input_state_map_[view],
-                                             text_input_state);
+  bool changed = ShouldUpdateTextInputState(text_input_state_map_[view],
+                                            text_input_state);
 
   text_input_state_map_[view] = text_input_state;
 
   // 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
@@ skipping 221 matching lines @@
                     "point exceeds text length).";
     return false;
   }
 
   selected_text->clear();
   selected_text->append(text.substr(pos, n));
   return true;
 }
 
 }  // namespace content