Reland: Update TextSelection for non-user initiated events

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 87 matching lines @@
   // a range for the selection, and the text including the selection which
   // might include several characters before and after it.
   class TextSelection {
    public:
     TextSelection();
     TextSelection(const TextSelection& other);
     ~TextSelection();
 
     void SetSelection(const base::string16& text,
                       size_t offset,
-                      const gfx::Range& range);
+                      const gfx::Range& range,
+                      bool user_initiated);
 
     const base::string16& selected_text() const { return selected_text_; }
     size_t offset() const { return offset_; }
     const gfx::Range& range() const { return range_; }
     const base::string16& text() const { return text_; }
+    bool user_initiated() const { return user_initiated_; }
 
    private:
     // The offset of the text stored in |text| relative to the start of the web
     // page.
-    size_t offset_;
+    size_t offset_ = 0;
 
     // The range of the selection in the page (highlighted text).
-    gfx::Range range_;
+    gfx::Range range_ = gfx::Range::InvalidRange();
 
     // The highlighted text which is the portion of |text_| marked by |offset_|
     // and |range_|. It will be an empty string if either |text_| or |range_|
     // are empty of this selection information is invalid (i.e., |range_| does
     // not cover any of |text_|.
     base::string16 selected_text_;
 
     // Part of the text on the page which includes the highlighted text plus
     // possibly several characters before and after it.
     base::string16 text_;
+
+    // True if text selection is triggered by user input.
+    bool user_initiated_ = false;
   };
 
   TextInputManager();
   ~TextInputManager();
 
   // Returns the currently active widget, i.e., the RWH which is associated with
   // |active_view_|.
   RenderWidgetHostImpl* GetActiveWidget() const;
 
   // ---------------------------------------------------------------------------
@@ skipping 45 matching lines @@
   // Called when the composition range and/or character bounds have changed.
   void ImeCompositionRangeChanged(
       RenderWidgetHostViewBase* view,
       const gfx::Range& range,
       const std::vector<gfx::Rect>& character_bounds);
 
   // Updates the new text selection information for the |view|.
   void SelectionChanged(RenderWidgetHostViewBase* view,
                         const base::string16& text,
                         size_t offset,
-                        const gfx::Range& range);
+                        const gfx::Range& range,
+                        bool user_initiated);
 
   // Registers the given |view| for tracking its TextInputState. This is called
   // by any view which has updates in its TextInputState (whether tab's RWHV or
   // that of a child frame). The |view| must unregister itself before being
   // destroyed (i.e., call TextInputManager::Unregister).
   void Register(RenderWidgetHostViewBase* view);
 
   // Clears the TextInputState from the |view|. If |view == active_view_|, this
   // call will lead to a TextInputState update since the TextInputState.type
   // should be reset to none.
@@ skipping 41 matching lines @@
   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__