Track composition range and character bounds on the browser side (Mac)

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 52 matching lines @@
 
 gfx::Rect TextInputManager::GetSelectionBoundsRect() const {
   if (!active_view_)
     return gfx::Rect();
 
   return gfx::RectBetweenSelectionBounds(
       selection_region_map_.at(active_view_).anchor,
       selection_region_map_.at(active_view_).focus);
 }
 
-const std::vector<gfx::Rect>* TextInputManager::GetCompositionCharacterBounds()
-    const {
-  return !!active_view_
-             ? &composition_range_info_map_.at(active_view_).character_bounds
-             : nullptr;
+const TextInputManager::CompositionRangeInfo*
+TextInputManager::GetCompositionRangeInfo(
+    RenderWidgetHostViewBase* view) const {
+  DCHECK(!view || IsRegistered(view));
+  if (!view)
+    view = active_view_;
+  return active_view_ ? &composition_range_info_map_.at(active_view_) : nullptr;
 }
 
 const TextInputManager::TextSelection* TextInputManager::GetTextSelection(
     RenderWidgetHostViewBase* view) const {
   DCHECK(!view || IsRegistered(view));
   if (!view)
     view = active_view_;
   return !!view ? &text_selection_map_.at(view) : nullptr;
 }
 
@@ skipping 102 matching lines @@
     return;
 
   selection_region_map_[view].anchor = anchor_bound;
   selection_region_map_[view].focus = focus_bound;
 
   FOR_EACH_OBSERVER(Observer, observer_list_,
                     OnSelectionBoundsChanged(this, view));
 #endif
 }
 
+// TODO(ekaramad): We use |range| only on Mac OS; but we still track its value
+// here for other platforms. See if there is a nice way around this with minimal
+// #ifdefs for platform specific code (https://crbug.com/602427).
 void TextInputManager::ImeCompositionRangeChanged(
     RenderWidgetHostViewBase* view,
     const gfx::Range& range,
     const std::vector<gfx::Rect>& character_bounds) {
   DCHECK(IsRegistered(view));
   composition_range_info_map_[view].character_bounds.clear();
 
   // The values for the bounds should be converted to root view's coordinates
   // before being stored.
   for (auto rect : character_bounds) {
     composition_range_info_map_[view].character_bounds.emplace_back(gfx::Rect(
         view->TransformPointToRootCoordSpace(rect.origin()), rect.size()));
   }
 
+  composition_range_info_map_[view].range.set_start(range.start());
+  composition_range_info_map_[view].range.set_end(range.end());
+
   FOR_EACH_OBSERVER(Observer, observer_list_,
                     OnImeCompositionRangeChanged(this, view));
 }
 
 void TextInputManager::SelectionChanged(RenderWidgetHostViewBase* view,
                                         const base::string16& text,
                                         size_t offset,
                                         const gfx::Range& range) {
   DCHECK(IsRegistered(view));
 
@@ skipping 78 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