Remove PREVIOUS_GRAPHEME_TRAILING.

ui/gfx/render_text.cc

 // 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.
 
 #include "ui/gfx/render_text.h"
 
 #include <algorithm>
 
 #include "base/i18n/break_iterator.h"
 #include "base/logging.h"
@@ skipping 69 matching lines @@
 
 StyleRange::StyleRange()
     : font(),
       foreground(SK_ColorBLACK),
       strike(false),
       underline(false),
       range() {
 }
 
 SelectionModel::SelectionModel() {
-  Init(0, 0, 0, PREVIOUS_GRAPHEME_TRAILING);
+  Init(0, 0, 0, LEADING);
 }
 
 SelectionModel::SelectionModel(size_t pos) {
-  Init(pos, pos, pos, PREVIOUS_GRAPHEME_TRAILING);
+  Init(pos, pos, pos, LEADING);
+}
+
+SelectionModel::SelectionModel(size_t start, size_t end) {
+  Init(start, end, end, LEADING);
 }
 
 SelectionModel::SelectionModel(size_t end,
                                size_t pos,
                                CaretPlacement placement) {
   Init(end, end, pos, placement);
 }
 
 SelectionModel::SelectionModel(size_t start,
                                size_t end,
@@ skipping 152 matching lines @@
   sel.set_selection_start(GetCursorPosition());
   SetSelectionModel(sel);
 }
 
 void RenderText::SelectAll() {
   SelectionModel sel(0, text().length(),
                      text().length(), SelectionModel::LEADING);
   SetSelectionModel(sel);
 }
 
+// TODO(xji): it does not work for languages do not use space as word breaker,
+// such as Chinese. Should use BreakIterator.
 void RenderText::SelectWord() {
   size_t selection_start = GetSelectionStart();
   size_t cursor_position = GetCursorPosition();
   // First we setup selection_start_ and selection_end_. There are so many cases
   // because we try to emulate what select-word looks like in a gtk textfield.
   // See associated testcase for different cases.
   if (cursor_position > 0 && cursor_position < text().length()) {
     if (u_isalnum(text()[cursor_position])) {
       selection_start = cursor_position;
       cursor_position++;
@@ skipping 19 matching lines @@
   // is defined as the position where we have alpha-num character on one side
   // and non-alpha-num char on the other side.
   for (; cursor_position < text().length(); cursor_position++) {
     if (IsPositionAtWordSelectionBoundary(cursor_position))
       break;
   }
 
   SelectionModel sel(selection_model());
   sel.set_selection_start(selection_start);
   sel.set_selection_end(cursor_position);
-  sel.set_caret_placement(SelectionModel::PREVIOUS_GRAPHEME_TRAILING);
+  sel.set_caret_pos(GetIndexOfPreviousGrapheme(cursor_position));
+  sel.set_caret_placement(SelectionModel::TRAILING);
   SetSelectionModel(sel);
 }
 
 const ui::Range& RenderText::GetCompositionRange() const {
   return composition_range_;
 }
 
 void RenderText::SetCompositionRange(const ui::Range& composition_range) {
   CHECK(!composition_range.IsValid() ||
         ui::Range(0, text_.length()).Contains(composition_range));
@@ skipping 228 matching lines @@
   if (!success)
     return current;
   while (iter.Advance()) {
     pos = iter.pos();
     if (iter.IsWord() && pos > current.selection_end())
       break;
   }
   return SelectionModel(pos, pos, SelectionModel::LEADING);
 }
 
-size_t RenderText::GetIndexOfPreviousGrapheme(size_t position) const {
+size_t RenderText::GetIndexOfPreviousGrapheme(size_t position) {
   // TODO(msw): Handle complex script.
   return std::max(static_cast<int>(position - 1), static_cast<int>(0));
 }
 
 void RenderText::ApplyCompositionAndSelectionStyles(
     StyleRanges* style_ranges) const {
   // TODO(msw): This pattern ought to be reconsidered; what about composition
   //            and selection overlaps, retain existing local style features?
   // Apply a composition style override to a copy of the style ranges.
   if (composition_range_.IsValid() && !composition_range_.is_empty()) {
@@ skipping 29 matching lines @@
   } else if ((display_offset_.x() + cursor_bounds_.right()) > display_width) {
     // Pan to show the cursor when it overflows to the right,
      display_offset_.set_x(display_width - cursor_bounds_.right());
   } else if ((display_offset_.x() + cursor_bounds_.x()) < 0) {
     // Pan to show the cursor when it overflows to the left.
     display_offset_.set_x(-cursor_bounds_.x());
   }
 }
 
 }  // namespace gfx