modification to RenderText for inheritance/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/command_line.h"
 #include "base/logging.h"
@@ skipping 180 matching lines @@
 }
 
 int NativeTextfieldViews::OnPerformDrop(const DropTargetEvent& event) {
   DCHECK(CanDrop(event.data()));
   DCHECK(!initiating_drag_ ||
          !GetRenderText()->IsPointInSelection(event.location()));
   OnBeforeUserAction();
   skip_input_method_cancel_composition_ = true;
 
   // TODO(msw): Remove final reference to FindCursorPosition.
-  size_t drop_destination =
+  gfx::SelectionModel drop_destination =
       GetRenderText()->FindCursorPosition(event.location());
   string16 text;
   event.data().GetString(&text);
 
   // We'll delete the current selection for a drag and drop within this view.
   bool move = initiating_drag_ && !event.IsControlDown() &&
               event.source_operations() & ui::DragDropTypes::DRAG_MOVE;
   if (move) {
     ui::Range selected_range;
     model_->GetSelectedRange(&selected_range);
     // Adjust the drop destination if it is on or after the current selection.
-    if (selected_range.GetMax() <= drop_destination)
-      drop_destination -= selected_range.length();
-    else if (selected_range.GetMin() <= drop_destination)
-      drop_destination = selected_range.GetMin();
-    model_->DeleteSelectionAndInsertTextAt(text, drop_destination);
+    if (selected_range.GetMax() <= drop_destination.selection_end())
+      drop_destination.set_selection_end(
+          drop_destination.selection_end() - selected_range.length());
+    else if (selected_range.GetMin() <= drop_destination.selection_end())
+      drop_destination.set_selection_end(selected_range.GetMin());
+    model_->DeleteSelectionAndInsertTextAt(text,
+                                           drop_destination.selection_end());
   } else {
-    model_->MoveCursorTo(drop_destination, false);
+    drop_destination.SetSelectionEmpty();
+    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;
 }
 
 void NativeTextfieldViews::OnDragDone() {
@@ skipping 419 matching lines @@
 
 ui::TextInputType NativeTextfieldViews::GetTextInputType() {
   if (textfield_->read_only() || !textfield_->IsEnabled())
     return ui::TEXT_INPUT_TYPE_NONE;
   else if (textfield_->IsPassword())
     return ui::TEXT_INPUT_TYPE_PASSWORD;
   return ui::TEXT_INPUT_TYPE_TEXT;
 }
 
 gfx::Rect NativeTextfieldViews::GetCaretBounds() {
-  gfx::RenderText* render_text = GetRenderText();
-  return render_text->GetCursorBounds(render_text->GetCursorPosition(),
-                                      render_text->insert_mode());
+  return GetRenderText()->CursorBounds();
 }
 
 bool NativeTextfieldViews::HasCompositionText() {
   return model_->HasCompositionText();
 }
 
 bool NativeTextfieldViews::GetTextRange(ui::Range* range) {
   // We don't allow the input method to retrieve or delete content from a
   // password box.
   if (GetTextInputType() != ui::TEXT_INPUT_TYPE_TEXT)
@@ skipping 305 matching lines @@
   // Filter out all control characters, including tab and new line characters,
   // and all characters with Alt modifier. But we need to allow characters with
   // AltGr modifier.
   // On Windows AltGr is represented by Alt+Ctrl, and on Linux it's a different
   // flag that we don't care about.
   return ((ch >= 0x20 && ch < 0x7F) || ch > 0x9F) &&
       (flags & ~(ui::EF_SHIFT_DOWN | ui::EF_CAPS_LOCK_DOWN)) != ui::EF_ALT_DOWN;
 }
 
 }  // namespace views