views: Improve cursor movements on word boundaries.

views/controls/textfield/textfield_views_model.cc

 // Copyright (c) 2010 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 "views/controls/textfield/textfield_views_model.h"
 
 #include <algorithm>
 
 #include "base/i18n/break_iterator.h"
 #include "base/logging.h"
@@ skipping 114 matching lines @@
 void TextfieldViewsModel::MoveCursorToPreviousWord(bool select) {
   // Notes: We always iterate words from the begining.
   // This is probably fast enough for our usage, but we may
   // want to modify WordIterator so that it can start from the
   // middle of string and advance backwards.
   base::BreakIterator iter(&text_, base::BreakIterator::BREAK_WORD);
   bool success = iter.Init();
   DCHECK(success);
   if (!success)
     return;
-  int prev = 0;
+  int last = 0;
   while (iter.Advance()) {
     if (iter.IsWord()) {
       size_t begin = iter.pos() - iter.GetString().length();
       if (begin == cursor_pos_) {
         // The cursor is at the beginning of a word.
         // Move to previous word.
-        cursor_pos_ = prev;
+        break;
       } else if(iter.pos() >= cursor_pos_) {
         // The cursor is in the middle or at the end of a word.
         // Move to the top of current word.
-        cursor_pos_ = begin;
+        last = begin;
+        break;
       } else {
-        prev = iter.pos() - iter.GetString().length();
-        continue;
+        last = iter.pos() - iter.GetString().length();
       }
-      if (!select)
-        ClearSelection();
-      break;
     }
   }
+
+  cursor_pos_ = last;
+  if (!select)
+    ClearSelection();
 }
 
 void TextfieldViewsModel::MoveCursorToNextWord(bool select) {
   base::BreakIterator iter(&text_, base::BreakIterator::BREAK_WORD);
   bool success = iter.Init();
   DCHECK(success);
   if (!success)
     return;
+  size_t pos = 0;
   while (iter.Advance()) {
-    if (iter.IsWord() && iter.pos() > cursor_pos_) {
-      cursor_pos_ = iter.pos();
-      if (!select)
-        ClearSelection();
+    pos = iter.pos();
+    if (iter.IsWord() && pos > cursor_pos_) {
       break;
     }
   }
+  cursor_pos_ = pos;
+  if (!select)
+    ClearSelection();
 }
 
 void TextfieldViewsModel::MoveCursorToStart(bool select) {
   cursor_pos_ = 0;
   if (!select)
     ClearSelection();
 }
 
 void TextfieldViewsModel::MoveCursorToEnd(bool select) {
   cursor_pos_ = text_.length();
@@ skipping 55 matching lines @@
 
 string16 TextfieldViewsModel::GetVisibleText(size_t begin, size_t end) const {
   DCHECK(end >= begin);
   if (is_password_) {
     return string16(end - begin, '*');
   }
   return text_.substr(begin, end - begin);
 }
 
 }  // namespace views