Reland Merge NativeTextfieldViews into views::Textfield.

ui/views/controls/textfield/textfield_views_model.cc

 // Copyright (c) 2012 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/views/controls/textfield/textfield_views_model.h"
 
 #include <algorithm>
 
 #include "base/i18n/break_iterator.h"
 #include "base/logging.h"
@@ skipping 288 matching lines @@
     : delegate_(delegate),
       render_text_(gfx::RenderText::CreateInstance()),
       current_edit_(edit_history_.end()) {
 }
 
 TextfieldViewsModel::~TextfieldViewsModel() {
   ClearEditHistory();
   ClearComposition();
 }
 
-const base::string16& TextfieldViewsModel::GetText() const {
-  return render_text_->text();
-}
-
-bool TextfieldViewsModel::SetText(const base::string16& text) {
+bool TextfieldViewsModel::SetText(const base::string16& new_text) {
   bool changed = false;
   if (HasCompositionText()) {
     ConfirmCompositionText();
     changed = true;
   }
-  if (GetText() != text) {
+  if (text() != new_text) {
     if (changed)  // No need to remember composition.
       Undo();
     size_t old_cursor = GetCursorPosition();
     // SetText moves the cursor to the end.
-    size_t new_cursor = text.length();
+    size_t new_cursor = new_text.length();
     SelectAll(false);
     // If there is a composition text, don't merge with previous edit.
     // Otherwise, force merge the edits.
     ExecuteAndRecordReplace(
         changed ? DO_NOT_MERGE : MERGE_WITH_PREVIOUS,
         old_cursor,
         new_cursor,
-        text,
+        new_text,
         0U);
     render_text_->SetCursorPosition(new_cursor);
   }
   ClearSelection();
   return changed;
 }
 
-void TextfieldViewsModel::Append(const base::string16& text) {
+void TextfieldViewsModel::Append(const base::string16& new_text) {
   if (HasCompositionText())
     ConfirmCompositionText();
   size_t save = GetCursorPosition();
   MoveCursor(gfx::LINE_BREAK,
              render_text_->GetVisualDirectionOfLogicalEnd(),
              false);
-  InsertText(text);
+  InsertText(new_text);
   render_text_->SetCursorPosition(save);
   ClearSelection();
 }
 
 bool TextfieldViewsModel::Delete() {
   if (HasCompositionText()) {
     // No undo/redo for composition text.
     CancelCompositionText();
     return true;
   }
   if (HasSelection()) {
     DeleteSelection();
     return true;
   }
-  if (GetText().length() > GetCursorPosition()) {
+  if (text().length() > GetCursorPosition()) {
     size_t cursor_position = GetCursorPosition();
     size_t next_grapheme_index = render_text_->IndexOfAdjacentGrapheme(
         cursor_position, gfx::CURSOR_FORWARD);
     ExecuteAndRecordDelete(gfx::Range(cursor_position, next_grapheme_index),
                            true);
     return true;
   }
   return false;
 }
 
 bool TextfieldViewsModel::Backspace() {
   if (HasCompositionText()) {
     // No undo/redo for composition text.
     CancelCompositionText();
     return true;
   }
   if (HasSelection()) {
     DeleteSelection();
     return true;
   }
   size_t cursor_position = GetCursorPosition();
   if (cursor_position > 0) {
     // Delete one code point, which may be two UTF-16 words.
-    size_t previous_char =
-        gfx::UTF16OffsetToIndex(GetText(), cursor_position, -1);
+    size_t previous_char = gfx::UTF16OffsetToIndex(text(), cursor_position, -1);
     ExecuteAndRecordDelete(gfx::Range(cursor_position, previous_char), true);
     return true;
   }
   return false;
 }
 
 size_t TextfieldViewsModel::GetCursorPosition() const {
   return render_text_->cursor_position();
 }
 
@@ skipping 19 matching lines @@
   return render_text_->MoveCursorTo(model);
 }
 
 bool TextfieldViewsModel::MoveCursorTo(const gfx::Point& point, bool select) {
   if (HasCompositionText())
     ConfirmCompositionText();
   return render_text_->MoveCursorTo(point, select);
 }
 
 base::string16 TextfieldViewsModel::GetSelectedText() const {
-  return GetText().substr(render_text_->selection().GetMin(),
-                          render_text_->selection().length());
+  return text().substr(render_text_->selection().GetMin(),
+                       render_text_->selection().length());
 }
 
 void TextfieldViewsModel::SelectRange(const gfx::Range& range) {
   if (HasCompositionText())
     ConfirmCompositionText();
   render_text_->SelectRange(range);
 }
 
 void TextfieldViewsModel::SelectSelectionModel(const gfx::SelectionModel& sel) {
   if (HasCompositionText())
@@ skipping 33 matching lines @@
       ++iter != edit_history_.end();
 }
 
 bool TextfieldViewsModel::Undo() {
   if (!CanUndo())
     return false;
   DCHECK(!HasCompositionText());
   if (HasCompositionText())  // safe guard for release build.
     CancelCompositionText();
 
-  base::string16 old = GetText();
+  base::string16 old = text();
   size_t old_cursor = GetCursorPosition();
   (*current_edit_)->Commit();
   (*current_edit_)->Undo(this);
 
   if (current_edit_ == edit_history_.begin())
     current_edit_ = edit_history_.end();
   else
     current_edit_--;
-  return old != GetText() || old_cursor != GetCursorPosition();
+  return old != text() || old_cursor != GetCursorPosition();
 }
 
 bool TextfieldViewsModel::Redo() {
   if (!CanRedo())
     return false;
   DCHECK(!HasCompositionText());
   if (HasCompositionText()) // safe guard for release build.
     CancelCompositionText();
 
   if (current_edit_ == edit_history_.end())
     current_edit_ = edit_history_.begin();
   else
     current_edit_ ++;
-  base::string16 old = GetText();
+  base::string16 old = text();
   size_t old_cursor = GetCursorPosition();
   (*current_edit_)->Redo(this);
-  return old != GetText() || old_cursor != GetCursorPosition();
+  return old != text() || old_cursor != GetCursorPosition();
 }
 
 bool TextfieldViewsModel::Cut() {
   if (!HasCompositionText() && HasSelection() && !render_text_->obscured()) {
     ui::ScopedClipboardWriter(
         ui::Clipboard::GetForCurrentThread(),
         ui::CLIPBOARD_TYPE_COPY_PASTE).WriteText(GetSelectedText());
     // A trick to let undo/redo handle cursor correctly.
     // Undoing CUT moves the cursor to the end of the change rather
     // than beginning, unlike Delete/Backspace.
@@ skipping 32 matching lines @@
   return !render_text_->selection().is_empty();
 }
 
 void TextfieldViewsModel::DeleteSelection() {
   DCHECK(!HasCompositionText());
   DCHECK(HasSelection());
   ExecuteAndRecordDelete(render_text_->selection(), false);
 }
 
 void TextfieldViewsModel::DeleteSelectionAndInsertTextAt(
-    const base::string16& text, size_t position) {
+    const base::string16& new_text,
+    size_t position) {
   if (HasCompositionText())
     CancelCompositionText();
   ExecuteAndRecordReplace(DO_NOT_MERGE,
                           GetCursorPosition(),
-                          position + text.length(),
-                          text,
+                          position + new_text.length(),
+                          new_text,
                           position);
 }
 
 base::string16 TextfieldViewsModel::GetTextFromRange(
     const gfx::Range& range) const {
-  if (range.IsValid() && range.GetMin() < GetText().length())
-    return GetText().substr(range.GetMin(), range.length());
+  if (range.IsValid() && range.GetMin() < text().length())
+    return text().substr(range.GetMin(), range.length());
   return base::string16();
 }
 
 void TextfieldViewsModel::GetTextRange(gfx::Range* range) const {
-  *range = gfx::Range(0, GetText().length());
+  *range = gfx::Range(0, text().length());
 }
 
 void TextfieldViewsModel::SetCompositionText(
     const ui::CompositionText& composition) {
   if (HasCompositionText())
     CancelCompositionText();
   else if (HasSelection())
     DeleteSelection();
 
   if (composition.text.empty())
     return;
 
   size_t cursor = GetCursorPosition();
-  base::string16 new_text = GetText();
+  base::string16 new_text = text();
   render_text_->SetText(new_text.insert(cursor, composition.text));
   gfx::Range range(cursor, cursor + composition.text.length());
   render_text_->SetCompositionRange(range);
   gfx::Range emphasized_range = GetFirstEmphasizedRange(composition);
   if (emphasized_range.IsValid()) {
     // This is a workaround due to the lack of support in RenderText to draw
     // a thick underline. In a composition returned from an IME, the segment
     // emphasized by a thick underline usually represents the target clause.
     // Because the target clause is more important than the actual selection
     // range (or caret position) in the composition here we use a selection-like
     // marker instead to show this range.
     // TODO(yukawa, msw): Support thick underline in RenderText and remove
     // this workaround.
     render_text_->SelectRange(gfx::Range(
         cursor + emphasized_range.GetMin(),
         cursor + emphasized_range.GetMax()));
   } else if (!composition.selection.is_empty()) {
     render_text_->SelectRange(gfx::Range(
         cursor + composition.selection.GetMin(),
         cursor + composition.selection.GetMax()));
   } else {
     render_text_->SetCursorPosition(cursor + composition.selection.end());
   }
 }
 
 void TextfieldViewsModel::ConfirmCompositionText() {
   DCHECK(HasCompositionText());
   gfx::Range range = render_text_->GetCompositionRange();
-  base::string16 text = GetText().substr(range.start(), range.length());
+  base::string16 composition = text().substr(range.start(), range.length());
   // TODO(oshima): current behavior on ChromeOS is a bit weird and not
   // sure exactly how this should work. Find out and fix if necessary.
-  AddOrMergeEditHistory(new InsertEdit(false, text, range.start()));
+  AddOrMergeEditHistory(new InsertEdit(false, composition, range.start()));
   render_text_->SetCursorPosition(range.end());
   ClearComposition();
   if (delegate_)
     delegate_->OnCompositionTextConfirmedOrCleared();
 }
 
 void TextfieldViewsModel::CancelCompositionText() {
   DCHECK(HasCompositionText());
   gfx::Range range = render_text_->GetCompositionRange();
   ClearComposition();
-  base::string16 new_text = GetText();
+  base::string16 new_text = text();
   render_text_->SetText(new_text.erase(range.start(), range.length()));
   render_text_->SetCursorPosition(range.start());
   if (delegate_)
     delegate_->OnCompositionTextConfirmedOrCleared();
 }
 
 void TextfieldViewsModel::ClearComposition() {
   render_text_->SetCompositionRange(gfx::Range::InvalidRange());
 }
 
 void TextfieldViewsModel::GetCompositionTextRange(gfx::Range* range) const {
   *range = gfx::Range(render_text_->GetCompositionRange());
 }
 
 bool TextfieldViewsModel::HasCompositionText() const {
   return !render_text_->GetCompositionRange().is_empty();
 }
 
+void TextfieldViewsModel::ClearEditHistory() {
+  STLDeleteElements(&edit_history_);
+  current_edit_ = edit_history_.end();
+}
+
 /////////////////////////////////////////////////////////////////
 // TextfieldViewsModel: private
 
-void TextfieldViewsModel::InsertTextInternal(const base::string16& text,
+void TextfieldViewsModel::InsertTextInternal(const base::string16& new_text,
                                              bool mergeable) {
   if (HasCompositionText()) {
     CancelCompositionText();
-    ExecuteAndRecordInsert(text, mergeable);
+    ExecuteAndRecordInsert(new_text, mergeable);
   } else if (HasSelection()) {
     ExecuteAndRecordReplaceSelection(mergeable ? MERGEABLE : DO_NOT_MERGE,
-                                     text);
+                                     new_text);
   } else {
-    ExecuteAndRecordInsert(text, mergeable);
+    ExecuteAndRecordInsert(new_text, mergeable);
   }
 }
 
-void TextfieldViewsModel::ReplaceTextInternal(const base::string16& text,
+void TextfieldViewsModel::ReplaceTextInternal(const base::string16& new_text,
                                               bool mergeable) {
   if (HasCompositionText()) {
     CancelCompositionText();
   } else if (!HasSelection()) {
     size_t cursor = GetCursorPosition();
     const gfx::SelectionModel& model = render_text_->selection_model();
     // When there is no selection, the default is to replace the next grapheme
-    // with |text|. So, need to find the index of next grapheme first.
+    // with |new_text|. So, need to find the index of next grapheme first.
     size_t next =
         render_text_->IndexOfAdjacentGrapheme(cursor, gfx::CURSOR_FORWARD);
     if (next == model.caret_pos())
       render_text_->MoveCursorTo(model);
     else
       render_text_->SelectRange(gfx::Range(next, model.caret_pos()));
   }
   // Edit history is recorded in InsertText.
-  InsertTextInternal(text, mergeable);
-}
-
-void TextfieldViewsModel::ClearEditHistory() {
-  STLDeleteElements(&edit_history_);
-  current_edit_ = edit_history_.end();
+  InsertTextInternal(new_text, mergeable);
 }
 
 void TextfieldViewsModel::ClearRedoHistory() {
   if (edit_history_.begin() == edit_history_.end())
     return;
   if (current_edit_ == edit_history_.end()) {
     ClearEditHistory();
     return;
   }
   EditHistory::iterator delete_start = current_edit_;
   delete_start++;
   STLDeleteContainerPointers(delete_start, edit_history_.end());
   edit_history_.erase(delete_start, edit_history_.end());
 }
 
 void TextfieldViewsModel::ExecuteAndRecordDelete(gfx::Range range,
                                                  bool mergeable) {
   size_t old_text_start = range.GetMin();
-  const base::string16 text = GetText().substr(old_text_start, range.length());
+  const base::string16 old_text = text().substr(old_text_start, range.length());
   bool backward = range.is_reversed();
-  Edit* edit = new DeleteEdit(mergeable, text, old_text_start, backward);
+  Edit* edit = new DeleteEdit(mergeable, old_text, old_text_start, backward);
   bool delete_edit = AddOrMergeEditHistory(edit);
   edit->Redo(this);
   if (delete_edit)
     delete edit;
 }
 
 void TextfieldViewsModel::ExecuteAndRecordReplaceSelection(
-    MergeType merge_type, const base::string16& new_text) {
+    MergeType merge_type,
+    const base::string16& new_text) {
   size_t new_text_start = render_text_->selection().GetMin();
   size_t new_cursor_pos = new_text_start + new_text.length();
   ExecuteAndRecordReplace(merge_type,
                           GetCursorPosition(),
                           new_cursor_pos,
                           new_text,
                           new_text_start);
 }
 
 void TextfieldViewsModel::ExecuteAndRecordReplace(
@@ skipping 11 matching lines @@
                                backward,
                                new_cursor_pos,
                                new_text,
                                new_text_start);
   bool delete_edit = AddOrMergeEditHistory(edit);
   edit->Redo(this);
   if (delete_edit)
     delete edit;
 }
 
-void TextfieldViewsModel::ExecuteAndRecordInsert(const base::string16& text,
+void TextfieldViewsModel::ExecuteAndRecordInsert(const base::string16& new_text,
                                                  bool mergeable) {
-  Edit* edit = new InsertEdit(mergeable, text, GetCursorPosition());
+  Edit* edit = new InsertEdit(mergeable, new_text, GetCursorPosition());
   bool delete_edit = AddOrMergeEditHistory(edit);
   edit->Redo(this);
   if (delete_edit)
     delete edit;
 }
 
 bool TextfieldViewsModel::AddOrMergeEditHistory(Edit* edit) {
   ClearRedoHistory();
 
   if (current_edit_ != edit_history_.end() && (*current_edit_)->Merge(edit)) {
@@ skipping 13 matching lines @@
   }
   return false;
 }
 
 void TextfieldViewsModel::ModifyText(size_t delete_from,
                                      size_t delete_to,
                                      const base::string16& new_text,
                                      size_t new_text_insert_at,
                                      size_t new_cursor_pos) {
   DCHECK_LE(delete_from, delete_to);
-  base::string16 text = GetText();
+  base::string16 old_text = text();
   ClearComposition();
   if (delete_from != delete_to)
-    render_text_->SetText(text.erase(delete_from, delete_to - delete_from));
+    render_text_->SetText(old_text.erase(delete_from, delete_to - delete_from));
   if (!new_text.empty())
-    render_text_->SetText(text.insert(new_text_insert_at, new_text));
+    render_text_->SetText(old_text.insert(new_text_insert_at, new_text));
   render_text_->SetCursorPosition(new_cursor_pos);
   // TODO(oshima): mac selects the text that is just undone (but gtk doesn't).
   // This looks fine feature and we may want to do the same.
 }
 
 }  // namespace views