Track composition range information on the browser side (Android)

content/browser/renderer_host/render_widget_host_view_android.cc

 // Copyright (c) 2012 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/render_widget_host_view_android.h"
 
 #include <android/bitmap.h>
 
 #include <utility>
 
@@ skipping 763 matching lines @@
   if (!content_view_core_)
     return;
 
   content_view_core_->UpdateImeAdapter(
       GetNativeImeAdapter(), static_cast<int>(state.type), state.flags,
       state.mode, state.value, state.selection_start, state.selection_end,
       state.composition_start, state.composition_end, state.show_ime_if_needed,
       state.is_non_ime_change);
 }
 
+void RenderWidgetHostViewAndroid::OnImeCompositionRangeChanged(
+    TextInputManager* text_input_manager,
+    RenderWidgetHostViewBase* updated_view) {
+  DCHECK_EQ(text_input_manager_, text_input_manager);
+  const TextInputManager::CompositionRangeInfo* info =
+      text_input_manager_->GetCompositionRangeInfo();
+  if (!info)
+    return;
+
+  std::vector<gfx::RectF> character_bounds_float;

[Charlie Reis, 2017/01/06 22:22:39]

nit: character_bounds

[EhsanK, 2017/01/06 22:37:16]

Acknowledged.

+  for (const gfx::Rect& rect : info->character_bounds) {

[Charlie Reis, 2017/01/06 22:22:40]

nit: No braces needed.

[EhsanK, 2017/01/06 22:37:16]

Acknowledged.

+    character_bounds_float.emplace_back(rect);
+  }
+  ime_adapter_android_.SetCharacterBounds(character_bounds_float);
+}
+
 void RenderWidgetHostViewAndroid::UpdateBackgroundColor(SkColor color) {
   if (cached_background_color_ == color)
     return;
 
   cached_background_color_ = color;
 
   if (delegated_frame_host_)
     delegated_frame_host_->UpdateBackgroundColor(color);
 
   if (content_view_core_)
@@ skipping 107 matching lines @@
 
 void RenderWidgetHostViewAndroid::SetMultiTouchZoomSupportEnabled(
     bool enabled) {
   gesture_provider_.SetMultiTouchZoomSupportEnabled(enabled);
 }
 
 void RenderWidgetHostViewAndroid::ImeCancelComposition() {
   ime_adapter_android_.CancelComposition();
 }
 
-void RenderWidgetHostViewAndroid::ImeCompositionRangeChanged(
-    const gfx::Range& range,
-    const std::vector<gfx::Rect>& character_bounds) {
-  std::vector<gfx::RectF> character_bounds_float;
-  for (const gfx::Rect& rect : character_bounds) {
-    character_bounds_float.emplace_back(rect);
-  }
-  ime_adapter_android_.SetCharacterBounds(character_bounds_float);
-}
 
 void RenderWidgetHostViewAndroid::FocusedNodeChanged(
     bool is_editable_node,
     const gfx::Rect& node_bounds_in_screen) {
   ime_adapter_android_.FocusedNodeChanged(is_editable_node);
 }
 
 void RenderWidgetHostViewAndroid::RenderProcessGone(
     base::TerminationStatus status, int error_code) {
   Destroy();
@@ skipping 1142 matching lines @@
   if (!compositor)
     return;
 
   overscroll_controller_ = base::MakeUnique<OverscrollControllerAndroid>(
       overscroll_refresh_handler, compositor,
       ui::GetScaleFactorForNativeView(GetNativeView()));
   is_showing_overscroll_glow_ = true;
 }
 
 }  // namespace content