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

content/browser/renderer_host/text_input_manager.h

 // 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.
 
 #ifndef CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_MANAGER_H__
 #define CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_MANAGER_H__
 
 #include <unordered_map>
 #include <utility>
 
@@ skipping 61 matching lines @@
     // page.
     size_t offset;
 
     // The current selection range relative to the start of the web page.
     gfx::Range range;
 
     // The text inside and around the current selection range.
     base::string16 text;
   };
 
+  // Composition range information.
+  struct CompositionRangeInfo {
+    CompositionRangeInfo();
+    CompositionRangeInfo(const CompositionRangeInfo& other);
+    ~CompositionRangeInfo();
+
+    std::vector<gfx::Rect> character_bounds;
+    gfx::Range range;
+  };
+
   TextInputManager();
   ~TextInputManager();
 
   // Returns the currently active widget, i.e., the RWH which is associated with
   // |active_view_|.
   RenderWidgetHostImpl* GetActiveWidget() const;
 
   // ---------------------------------------------------------------------------
   // The following methods can be used to obtain information about IME-related
   // state for the active RenderWidgetHost. If the active widget is nullptr, the
   // methods below will return nullptr as well.
   // Users of these methods should not hold on to the pointers as they become
   // dangling if the TextInputManager or |active_view_| are destroyed.
 
   // Returns the currently stored TextInputState. An state of nullptr can be
   // interpreted as a ui::TextInputType of ui::TEXT_INPUT_TYPE_NONE.
   const TextInputState* GetTextInputState() const;
 
   // Returns the rect between selection bounds.
   gfx::Rect GetSelectionBoundsRect() const;
 
-  // Returns a vector of rects representing the character bounds.
-  const std::vector<gfx::Rect>* GetCompositionCharacterBounds() const;
+  // Returns the composition range and character bounds information for the
+  // |view|. If |view| == nullptr, it will assume |active_view_| and return its
+  // state. If |active_view_| == nullptr, this method will return nullptr.
+  const TextInputManager::CompositionRangeInfo* GetCompositionRangeInfo(
+      RenderWidgetHostViewBase* view = nullptr) const;
 
   // The following method returns the text selection state for the given |view|.
   // If |view| == nullptr, it will assume |active_view_| and return its state.
   // In the case of |active_view_| == nullptr, the method will return nullptr.
   const TextSelection* GetTextSelection(
       RenderWidgetHostViewBase* view = nullptr) const;
 
   // ---------------------------------------------------------------------------
   // The following methods are called by RWHVs on the tab to update their IME-
   // related state.
@@ skipping 58 matching lines @@
   struct SelectionRegion {
     SelectionRegion();
     SelectionRegion(const SelectionRegion& other);
 
     // The begining of the selection region.
     gfx::SelectionBound anchor;
     // The end of the selection region (caret position).
     gfx::SelectionBound focus;
   };
 
-  // Ccomposition range information.
-  struct CompositionRangeInfo {
-    CompositionRangeInfo();
-    CompositionRangeInfo(const CompositionRangeInfo& other);
-    ~CompositionRangeInfo();
-
-    std::vector<gfx::Rect> character_bounds;
-  };
-
   // This class is used to create maps which hold specific IME state for a
   // view.
   template <class Value>
   class ViewMap : public std::unordered_map<RenderWidgetHostViewBase*, Value> {
   };
 
   void NotifyObserversAboutInputStateUpdate(RenderWidgetHostViewBase* view,
                                             bool did_update_state);
 
   // The view with active text input state, i.e., a focused <input> element.
   // It will be nullptr if no such view exists. Note that the active view
   // cannot have a |TextInputState.type| of ui::TEXT_INPUT_TYPE_NONE.
   RenderWidgetHostViewBase* active_view_;
 
   // The following maps track corresponding IME state for views. For each view,
   // the values in the map are initialized and cleared in Register and
   // Unregister methods, respectively.
   ViewMap<TextInputState> text_input_state_map_;
   ViewMap<SelectionRegion> selection_region_map_;
   ViewMap<CompositionRangeInfo> composition_range_info_map_;
   ViewMap<TextSelection> text_selection_map_;
 
   base::ObserverList<Observer> observer_list_;
 
   DISALLOW_COPY_AND_ASSIGN(TextInputManager);
 };
 }
 
 #endif  // CONTENT_BROWSER_RENDERER_HOST_TEXT_INPUT_MANAGER_H__