Tracking composition range on the browser side (Aura)

content/browser/renderer_host/render_widget_host_view_aura.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_aura.h"
 
 #include <set>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 958 matching lines @@
       display::Screen::GetScreen()->GetDisplayNearestWindow(window_);
   current_cursor_.SetDisplayInfo(display);
   UpdateCursorIfOverSelf();
 }
 
 void RenderWidgetHostViewAura::SetIsLoading(bool is_loading) {
   is_loading_ = is_loading;
   UpdateCursorIfOverSelf();
 }
 
-void RenderWidgetHostViewAura::ImeCompositionRangeChanged(
-    const gfx::Range& range,
-    const std::vector<gfx::Rect>& character_bounds) {
-  composition_character_bounds_ = character_bounds;
-}
-
 void RenderWidgetHostViewAura::RenderProcessGone(base::TerminationStatus status,
                                                  int error_code) {
   UpdateCursorIfOverSelf();
   Destroy();
 }
 
 void RenderWidgetHostViewAura::Destroy() {
   // Beware, this function is not called on all destruction paths. If |window_|
   // has been created, then it will implicitly end up calling
   // ~RenderWidgetHostViewAura when |window_| is destroyed. Otherwise, The
@@ skipping 531 matching lines @@
 gfx::Rect RenderWidgetHostViewAura::GetCaretBounds() const {
   if (!text_input_manager_ || !text_input_manager_->GetActiveWidget())
     return gfx::Rect();
   return ConvertRectToScreen(text_input_manager_->GetSelectionBoundsRect());
 }
 
 bool RenderWidgetHostViewAura::GetCompositionCharacterBounds(
     uint32_t index,
     gfx::Rect* rect) const {
   DCHECK(rect);
-  if (index >= composition_character_bounds_.size())
+
+  if (!text_input_manager_ || !text_input_manager_->GetActiveWidget())
     return false;
-  *rect = ConvertRectToScreen(composition_character_bounds_[index]);
+
+  const std::vector<gfx::Rect>* composition_character_bounds =
+      text_input_manager_->GetCompositionCharacterBounds();
+  if (index >= composition_character_bounds->size())
+    return false;
+  *rect = ConvertRectToScreen(composition_character_bounds->at(index));
   return true;
 }
 
 bool RenderWidgetHostViewAura::HasCompositionText() const {
   return has_composition_text_;
 }
 
 bool RenderWidgetHostViewAura::GetTextRange(gfx::Range* range) const {
   range->set_start(selection_text_offset_);
   range->set_end(selection_text_offset_ + selection_text_.length());
@@ skipping 1452 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // RenderWidgetHostViewBase, public:
 
 // static
 void RenderWidgetHostViewBase::GetDefaultScreenInfo(WebScreenInfo* results) {
   GetScreenInfoForWindow(results, NULL);
 }
 
 }  // namespace content