Move Range code to gfx.

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"
 #include "base/stl_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
-#include "ui/base/range/range.h"
 #include "ui/base/text/utf16_indexing.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/font.h"
+#include "ui/gfx/range/range.h"
 #include "ui/gfx/render_text.h"
 #include "ui/gfx/text_constants.h"
 #include "ui/views/controls/textfield/textfield.h"
 
 namespace views {
 
 namespace internal {
 
 // An edit object holds enough information/state to undo/redo the
 // change. Two edits are merged when possible, for example, when
@@ skipping 233 matching lines @@
   }
 };
 
 }  // namespace internal
 
 namespace {
 
 // Returns the first segment that is visually emphasized. Usually it's used for
 // representing the target clause (on Windows). Returns an invalid range if
 // there is no such a range.
-ui::Range GetFirstEmphasizedRange(const ui::CompositionText& composition) {
+gfx::Range GetFirstEmphasizedRange(const ui::CompositionText& composition) {
   for (size_t i = 0; i < composition.underlines.size(); ++i) {
     const ui::CompositionUnderline& underline = composition.underlines[i];
     if (underline.thick)
-      return ui::Range(underline.start_offset, underline.end_offset);
+      return gfx::Range(underline.start_offset, underline.end_offset);
   }
-  return ui::Range::InvalidRange();
+  return gfx::Range::InvalidRange();
 }
 
 }  // namespace
 
 using internal::Edit;
 using internal::DeleteEdit;
 using internal::InsertEdit;
 using internal::ReplaceEdit;
 using internal::MergeType;
 using internal::DO_NOT_MERGE;
@@ skipping 67 matching lines @@
     return true;
   }
   if (HasSelection()) {
     DeleteSelection();
     return true;
   }
   if (GetText().length() > GetCursorPosition()) {
     size_t cursor_position = GetCursorPosition();
     size_t next_grapheme_index = render_text_->IndexOfAdjacentGrapheme(
         cursor_position, gfx::CURSOR_FORWARD);
-    ExecuteAndRecordDelete(ui::Range(cursor_position, next_grapheme_index),
+    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 =
         ui::UTF16OffsetToIndex(GetText(), cursor_position, -1);
-    ExecuteAndRecordDelete(ui::Range(cursor_position, previous_char), true);
+    ExecuteAndRecordDelete(gfx::Range(cursor_position, previous_char), true);
     return true;
   }
   return false;
 }
 
 size_t TextfieldViewsModel::GetCursorPosition() const {
   return render_text_->cursor_position();
 }
 
 void TextfieldViewsModel::MoveCursor(gfx::BreakType break_type,
                                      gfx::VisualCursorDirection direction,
                                      bool select) {
   if (HasCompositionText())
     ConfirmCompositionText();
   render_text_->MoveCursor(break_type, direction, select);
 }
 
 bool TextfieldViewsModel::MoveCursorTo(const gfx::SelectionModel& model) {
   if (HasCompositionText()) {
     ConfirmCompositionText();
     // ConfirmCompositionText() updates cursor position. Need to reflect it in
     // the SelectionModel parameter of MoveCursorTo().
-    ui::Range range(render_text_->selection().start(), model.caret_pos());
+    gfx::Range range(render_text_->selection().start(), model.caret_pos());
     if (!range.is_empty())
       return render_text_->SelectRange(range);
     return render_text_->MoveCursorTo(
         gfx::SelectionModel(model.caret_pos(), model.caret_affinity()));
   }
   return render_text_->MoveCursorTo(model);
 }
 
 bool TextfieldViewsModel::MoveCursorTo(const gfx::Point& point, bool select) {
   if (HasCompositionText())
     ConfirmCompositionText();
   return render_text_->MoveCursorTo(point, select);
 }
 
 string16 TextfieldViewsModel::GetSelectedText() const {
   return GetText().substr(render_text_->selection().GetMin(),
                           render_text_->selection().length());
 }
 
-void TextfieldViewsModel::SelectRange(const ui::Range& range) {
+void TextfieldViewsModel::SelectRange(const gfx::Range& range) {
   if (HasCompositionText())
     ConfirmCompositionText();
   render_text_->SelectRange(range);
 }
 
 void TextfieldViewsModel::SelectSelectionModel(const gfx::SelectionModel& sel) {
   if (HasCompositionText())
     ConfirmCompositionText();
   render_text_->MoveCursorTo(sel);
 }
@@ skipping 69 matching lines @@
 bool TextfieldViewsModel::Cut() {
   if (!HasCompositionText() && HasSelection() && !render_text_->obscured()) {
     ui::ScopedClipboardWriter(
         ui::Clipboard::GetForCurrentThread(),
         ui::Clipboard::BUFFER_STANDARD).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.
     // TODO(oshima): Change Delete/Backspace to use DeleteSelection,
     // update DeleteEdit and remove this trick.
-    const ui::Range& selection = render_text_->selection();
-    render_text_->SelectRange(ui::Range(selection.end(), selection.start()));
+    const gfx::Range& selection = render_text_->selection();
+    render_text_->SelectRange(gfx::Range(selection.end(), selection.start()));
     DeleteSelection();
     return true;
   }
   return false;
 }
 
 bool TextfieldViewsModel::Copy() {
   if (!HasCompositionText() && HasSelection() && !render_text_->obscured()) {
     ui::ScopedClipboardWriter(
         ui::Clipboard::GetForCurrentThread(),
@@ skipping 28 matching lines @@
     const string16& text, size_t position) {
   if (HasCompositionText())
     CancelCompositionText();
   ExecuteAndRecordReplace(DO_NOT_MERGE,
                           GetCursorPosition(),
                           position + text.length(),
                           text,
                           position);
 }
 
-string16 TextfieldViewsModel::GetTextFromRange(const ui::Range& range) const {
+string16 TextfieldViewsModel::GetTextFromRange(const gfx::Range& range) const {
   if (range.IsValid() && range.GetMin() < GetText().length())
     return GetText().substr(range.GetMin(), range.length());
   return string16();
 }
 
-void TextfieldViewsModel::GetTextRange(ui::Range* range) const {
-  *range = ui::Range(0, GetText().length());
+void TextfieldViewsModel::GetTextRange(gfx::Range* range) const {
+  *range = gfx::Range(0, GetText().length());
 }
 
 void TextfieldViewsModel::SetCompositionText(
     const ui::CompositionText& composition) {
   if (HasCompositionText())
     CancelCompositionText();
   else if (HasSelection())
     DeleteSelection();
 
   if (composition.text.empty())
     return;
 
   size_t cursor = GetCursorPosition();
   string16 new_text = GetText();
   render_text_->SetText(new_text.insert(cursor, composition.text));
-  ui::Range range(cursor, cursor + composition.text.length());
+  gfx::Range range(cursor, cursor + composition.text.length());
   render_text_->SetCompositionRange(range);
-  ui::Range emphasized_range = GetFirstEmphasizedRange(composition);
+  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(ui::Range(
+    render_text_->SelectRange(gfx::Range(
         cursor + emphasized_range.GetMin(),
         cursor + emphasized_range.GetMax()));
   } else if (!composition.selection.is_empty()) {
-    render_text_->SelectRange(ui::Range(
+    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());
-  ui::Range range = render_text_->GetCompositionRange();
+  gfx::Range range = render_text_->GetCompositionRange();
   string16 text = GetText().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()));
   render_text_->SetCursorPosition(range.end());
   ClearComposition();
   if (delegate_)
     delegate_->OnCompositionTextConfirmedOrCleared();
 }
 
 void TextfieldViewsModel::CancelCompositionText() {
   DCHECK(HasCompositionText());
-  ui::Range range = render_text_->GetCompositionRange();
+  gfx::Range range = render_text_->GetCompositionRange();
   ClearComposition();
   string16 new_text = GetText();
   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(ui::Range::InvalidRange());
+  render_text_->SetCompositionRange(gfx::Range::InvalidRange());
 }
 
-void TextfieldViewsModel::GetCompositionTextRange(ui::Range* range) const {
-  *range = ui::Range(render_text_->GetCompositionRange());
+void TextfieldViewsModel::GetCompositionTextRange(gfx::Range* range) const {
+  *range = gfx::Range(render_text_->GetCompositionRange());
 }
 
 bool TextfieldViewsModel::HasCompositionText() const {
   return !render_text_->GetCompositionRange().is_empty();
 }
 
 /////////////////////////////////////////////////////////////////
 // TextfieldViewsModel: private
 
 void TextfieldViewsModel::InsertTextInternal(const string16& text,
@@ skipping 16 matching lines @@
   } 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.
     size_t next =
         render_text_->IndexOfAdjacentGrapheme(cursor, gfx::CURSOR_FORWARD);
     if (next == model.caret_pos())
       render_text_->MoveCursorTo(model);
     else
-      render_text_->SelectRange(ui::Range(next, model.caret_pos()));
+      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();
 }
 
 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(ui::Range range,
+void TextfieldViewsModel::ExecuteAndRecordDelete(gfx::Range range,
                                                  bool mergeable) {
   size_t old_text_start = range.GetMin();
   const string16 text = GetText().substr(old_text_start, range.length());
   bool backward = range.is_reversed();
   Edit* edit = new DeleteEdit(mergeable, text, old_text_start, backward);
   bool delete_edit = AddOrMergeEditHistory(edit);
   edit->Redo(this);
   if (delete_edit)
     delete edit;
 }
@@ skipping 71 matching lines @@
   if (delete_from != delete_to)
     render_text_->SetText(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_->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