Clean up of SelectionModel

views/controls/textfield/native_textfield_views.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 "views/controls/textfield/native_textfield_views.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 208 matching lines @@
   if (move) {
     gfx::SelectionModel selected;
     model_->GetSelectionModel(&selected);
     // Adjust the drop destination if it is on or after the current selection.
     size_t max_of_selected_range = std::max(selected.selection_start(),
                                             selected.selection_end());
     size_t min_of_selected_range = std::min(selected.selection_start(),
                                             selected.selection_end());
     size_t selected_range_length = max_of_selected_range -
                                    min_of_selected_range;
-    if (max_of_selected_range <= drop_destination.selection_end())
-      drop_destination.set_selection_end(
-          drop_destination.selection_end() - selected_range_length);
-    else if (min_of_selected_range <= drop_destination.selection_end())
-      drop_destination.set_selection_end(min_of_selected_range);
-    model_->DeleteSelectionAndInsertTextAt(text,
-                                           drop_destination.selection_end());
+    size_t drop_destination_end = drop_destination.selection_end();
+    if (max_of_selected_range <= drop_destination_end)
+      drop_destination_end -= selected_range_length;
+    else if (min_of_selected_range <= drop_destination_end)
+      drop_destination_end = min_of_selected_range;
+    model_->DeleteSelectionAndInsertTextAt(text, drop_destination_end);
   } else {
-    drop_destination.set_selection_start(drop_destination.selection_end());
+    drop_destination = gfx::SelectionModel(drop_destination.selection_end(),

[msw, 2011/10/04 07:25:41]

Why make this change? Constructing a new SelectionModel seems worse than setting
the selection start on the existing model; afaict the result is the same.

[xji, 2011/10/05 01:23:42]

Ah, this is not needed. drop_destination's selection_start is the same as
selection_end at this point.

+                                           drop_destination.caret_pos(),
+                                           drop_destination.caret_placement());
     model_->MoveCursorTo(drop_destination);
     // Drop always inserts text even if the textfield is not in insert mode.
     model_->InsertText(text);
   }
   skip_input_method_cancel_composition_ = false;
   UpdateAfterChange(true, true);
   OnAfterUserAction();
   return move ? ui::DragDropTypes::DRAG_MOVE : ui::DragDropTypes::DRAG_COPY;
 }
 
@@ skipping 23 matching lines @@
   if (GetTextInputType() == ui::TEXT_INPUT_TYPE_NONE)
     return;
 
   gfx::SelectionModel start_pos = GetRenderText()->FindCursorPosition(start);
   gfx::SelectionModel end_pos = GetRenderText()->FindCursorPosition(end);
 
   OnBeforeUserAction();
   // Merge selection models of "start_pos" and "end_pos" so that
   // selection start is the value from "start_pos", while selection end,
   // caret position, and caret placement are values from "end_pos".
-  gfx::SelectionModel sel(end_pos);
-  sel.set_selection_start(start_pos.selection_start());
+  gfx::SelectionModel sel(start_pos.selection_start(), end_pos.selection_end(),
+                          end_pos.caret_pos(), end_pos.caret_placement());
   model_->SelectSelectionModel(sel);
 
   OnCaretBoundsChanged();
   SchedulePaint();
   OnAfterUserAction();
 }
 
 gfx::NativeCursor NativeTextfieldViews::GetCursor(const MouseEvent& event) {
   bool in_selection = GetRenderText()->IsPointInSelection(event.location());
   bool drag_event = event.type() == ui::ET_MOUSE_DRAGGED;
@@ skipping 190 matching lines @@
 
 gfx::NativeView NativeTextfieldViews::GetTestingHandle() const {
   NOTREACHED();
   return NULL;
 }
 
 bool NativeTextfieldViews::IsIMEComposing() const {
   return model_->HasCompositionText();
 }
 
+void NativeTextfieldViews::GetSelectedRange(ui::Range* range) const {
+  model_->GetSelectedRange(range);
+}
+
+void NativeTextfieldViews::SelectRange(const ui::Range& range) {
+  model_->SelectRange(range);
+  OnCaretBoundsChanged();
+  SchedulePaint();
+}
+
 void NativeTextfieldViews::GetSelectionModel(gfx::SelectionModel* sel) const {
   model_->GetSelectionModel(sel);
 }
 
 void NativeTextfieldViews::SelectSelectionModel(
     const gfx::SelectionModel& sel) {
   model_->SelectSelectionModel(sel);
   OnCaretBoundsChanged();
   SchedulePaint();
 }
@@ skipping 248 matching lines @@
   range->set_start(sel.selection_start());
   range->set_end(sel.selection_end());
   return true;
 }
 
 bool NativeTextfieldViews::SetSelectionRange(const ui::Range& range) {
   if (GetTextInputType() != ui::TEXT_INPUT_TYPE_TEXT || !range.IsValid())
     return false;
 
   OnBeforeUserAction();
-  SelectSelectionModel(gfx::SelectionModel(range.start(), range.end()));
+  SelectRange(range);
   OnAfterUserAction();
   return true;
 }
 
 bool NativeTextfieldViews::DeleteRange(const ui::Range& range) {
   if (GetTextInputType() != ui::TEXT_INPUT_TYPE_TEXT || range.is_empty())
     return false;
 
   OnBeforeUserAction();
-  gfx::SelectionModel selection(range.start(), range.end());
-  model_->SelectSelectionModel(selection);
+  model_->SelectRange(range);
   if (model_->HasSelection()) {
     model_->DeleteSelection();
     UpdateAfterChange(true, true);
   }
   OnAfterUserAction();
   return true;
 }
 
 bool NativeTextfieldViews::GetTextFromRange(
     const ui::Range& range,
@@ skipping 280 matching lines @@
 
 #if defined(USE_AURA)
 // static
 NativeTextfieldWrapper* NativeTextfieldWrapper::CreateWrapper(
     Textfield* field) {
   return new NativeTextfieldViews(field);
 }
 #endif
 
 }  // namespace views