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

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 1472 matching lines @@
 }
 
 bool RenderWidgetHostViewAura::GetCompositionCharacterBounds(
     uint32_t index,
     gfx::Rect* rect) const {
   DCHECK(rect);
 
   if (!text_input_manager_ || !text_input_manager_->GetActiveWidget())
     return false;
 
-  const std::vector<gfx::Rect>* composition_character_bounds =
-      text_input_manager_->GetCompositionCharacterBounds();
-  if (index >= composition_character_bounds->size())
+  const TextInputManager::CompositionRangeInfo* composition_range_info =
+      text_input_manager_->GetCompositionRangeInfo();
+
+  if (index >= composition_range_info->character_bounds.size())
     return false;
-  *rect = ConvertRectToScreen(composition_character_bounds->at(index));
+  *rect = ConvertRectToScreen(composition_range_info->character_bounds[index]);
   return true;
 }
 
 bool RenderWidgetHostViewAura::HasCompositionText() const {
   return has_composition_text_;
 }
 
 bool RenderWidgetHostViewAura::GetTextRange(gfx::Range* range) const {
   if (!text_input_manager_)
     return false;
@@ skipping 1544 matching lines @@
     return;
   }
 
   // Set the CLIPBOARD_TYPE_SELECTION to the ui::Clipboard.
   ui::ScopedClipboardWriter clipboard_writer(ui::CLIPBOARD_TYPE_SELECTION);
   clipboard_writer.WriteText(text_selection->text.substr(pos, n));
 #endif  // defined(USE_X11) && !defined(OS_CHROMEOS)
 }
 
 }  // namespace content