Clean up of SelectionModel

ui/gfx/render_text.h

 // Copyright (c) 2011 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 UI_GFX_RENDER_TEXT_H_
 #define UI_GFX_RENDER_TEXT_H_
 #pragma once
 
 #include <algorithm>
 #include <vector>
@@ skipping 82 matching lines @@
   const Rect& display_rect() const { return display_rect_; }
   virtual void SetDisplayRect(const Rect& r);
 
   // This cursor position corresponds to SelectionModel::selection_end. In
   // addition to representing the selection end, it's also where logical text
   // edits take place, and doesn't necessarily correspond to
   // SelectionModel::caret_pos.
   size_t GetCursorPosition() const;
   void SetCursorPosition(size_t position);
 
-  void SetCaretPlacement(SelectionModel::CaretPlacement placement) {
-      selection_model_.set_caret_placement(placement);
-  }
-
   // Moves the cursor left or right. Cursor movement is visual, meaning that
   // left and right are relative to screen, not the directionality of the text.
   // If |select| is false, the selection start is moved to the same position.
   void MoveCursorLeft(BreakType break_type, bool select);
   void MoveCursorRight(BreakType break_type, bool select);
 
   // Set the selection_model_ to the value of |selection|.
   // The selection model components are modified if invalid.
   // Returns true if the cursor position or selection range changed.
   // If |selectin_start_| or |selection_end_| or |caret_pos_| in
@@ skipping 55 matching lines @@
                                bool insert_mode);
 
   // Compute the current cursor bounds, panning the text to show the cursor in
   // the display rect if necessary. These bounds are in local coordinates.
   // Subsequent text, cursor, or bounds changes may invalidate returned values.
   const Rect& GetUpdatedCursorBounds();
 
   // Get the logical index of the grapheme following the argument |position|.
   virtual size_t GetIndexOfNextGrapheme(size_t position);
 
+  // Returns the selection model of selection_start_.

[msw, 2011/09/29 02:20:21]

|selection_start_| isn't a member of this class, can you update the comment to
"Return a SelectionModel with the cursor at the current selection's start."

[xji, 2011/10/03 23:18:57]

Done.

+  // The returned value represents a cursor/caret position without a selection.
+  SelectionModel GetSelectionModelForSelectionStart();
+
  protected:
   RenderText();
 
   const Point& GetUpdatedDisplayOffset();
 
   void set_cached_bounds_and_offset_valid(bool valid) {
       cached_bounds_and_offset_valid_ = valid;
   }
 
   const StyleRanges& style_ranges() const { return style_ranges_; }
@@ skipping 53 matching lines @@
   // grapheme, or if there is no previous grapheme, leading the cursor position.
   // If |select| is false, the selection start is moved to the same position.
   // If the |position| is not a cursorable position (not on grapheme boundary),
   // it is a NO-OP.
   void MoveCursorTo(size_t position, bool select);
 
   // Update the cached bounds and display offset to ensure that the current
   // cursor is within the visible display area.
   void UpdateCachedBoundsAndOffset();
 
-  // Returns the selection model of selection_start_.
-  // The returned value represents a cursor/caret position without a selection.
-  SelectionModel GetSelectionModelForSelectionStart();
-
   // Logical UTF-16 string data to be drawn.
   string16 text_;
 
   // Logical selection range and visual cursor position.
   SelectionModel selection_model_;
 
   // The cached cursor bounds; get these bounds with GetUpdatedCursorBounds.
   Rect cursor_bounds_;
 
   // The cursor visibility and insert mode.
@@ skipping 20 matching lines @@
   // The cached bounds and offset are invalidated by changes to the cursor,
   // selection, font, and other operations that adjust the visible text bounds.
   bool cached_bounds_and_offset_valid_;
 
   DISALLOW_COPY_AND_ASSIGN(RenderText);
 };
 
 }  // namespace gfx
 
 #endif  // UI_GFX_RENDER_TEXT_H_