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 182 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.set_selection_start(drop_destination.selection_end());
+    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 12 matching lines @@
 void NativeTextfieldViews::OnFocus() {
   NOTREACHED();
 }
 
 void NativeTextfieldViews::OnBlur() {
   NOTREACHED();
 }
 
 void NativeTextfieldViews::SelectRect(const gfx::Point& start,
                                       const gfx::Point& end) {
-  size_t start_pos = GetRenderText()->FindCursorPosition(start);
-  size_t end_pos = GetRenderText()->FindCursorPosition(end);
-  SetSelectionRange(ui::Range(start_pos, end_pos));
+  gfx::SelectionModel start_pos = GetRenderText()->FindCursorPosition(start);
+  gfx::SelectionModel end_pos = GetRenderText()->FindCursorPosition(end);
+
+  if (GetTextInputType() != ui::TEXT_INPUT_TYPE_NONE)

[msw, 2011/08/03 23:44:38]

Move this check above the start_pos and end_pos calculations.

Blarg, the (GetTextInputType() != ui::TEXT_INPUT_TYPE_TEXT) checks are
everywhere, I bet password fields are pretty broken, we can look into that issue
later. You can revert this to match the other checks if you want...

[xji, 2011/08/04 06:26:50]

Done.

+    return;
+  if (start_pos.selection_end() == end_pos.selection_end()

[msw, 2011/08/03 23:44:38]

OK, I think we can trust the results of FindCursorPosition well enough to
discard this check. The 'corresponding' check in SetSelectionRange is done on
'raw' input to the class, which is less trustworthy.

[xji, 2011/08/04 06:26:50]

Ah, you are right here.
I suspect that we will  need Get/SelectSelectionRange() later (to save/restore)
selection model during switch tab content. But I agree with you that we will
worry about that later.
Done.

+      && start_pos.selection_end() == std::numeric_limits<size_t>::max())
+    return;
+
+  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());
+  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;
   bool text_cursor = !initiating_drag_ && (drag_event || !in_selection);
 #if defined(OS_WIN)
   static HCURSOR ibeam = LoadCursor(NULL, IDC_IBEAM);
   static HCURSOR arrow = LoadCursor(NULL, IDC_ARROW);
   return text_cursor ? ibeam : arrow;
@@ skipping 398 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 271 matching lines @@
 
 void NativeTextfieldViews::OnCaretBoundsChanged() {
   // TODO(suzhe): changed from DCHECK. See http://crbug.com/81320.
   if (textfield_->GetInputMethod())
     textfield_->GetInputMethod()->OnCaretBoundsChanged(textfield_);
 
   // Notify selection controller
   if (!touch_selection_controller_.get())
     return;
   gfx::RenderText* render_text = GetRenderText();
-  ui::Range range = render_text->GetSelection();
-  gfx::Rect start_cursor = render_text->GetCursorBounds(range.start(), false);
-  gfx::Rect end_cursor = render_text->GetCursorBounds(range.end(), false);
+  const gfx::SelectionModel& sel = render_text->selection_model();
+  gfx::SelectionModel start_sel(sel.selection_start(), sel.selection_start(),
+      sel.selection_start(), gfx::SelectionModel::LEADING);
+  gfx::Rect start_cursor = render_text->GetCursorBounds(start_sel, false);
+  gfx::Rect end_cursor = render_text->GetCursorBounds(sel, false);
   gfx::Rect display_rect = render_text->display_rect();
   int total_offset_x = display_rect.x() + render_text->display_offset().x();
   int total_offset_y = display_rect.y() + render_text->display_offset().y() +
                        (display_rect.height() - start_cursor.height()) / 2;
   gfx::Point start(start_cursor.x() + total_offset_x,
                    start_cursor.bottom() + total_offset_y);
   gfx::Point end(end_cursor.x() + total_offset_x,
                  end_cursor.bottom() + total_offset_y);
   touch_selection_controller_->SelectionChanged(start, end);
 }
@@ skipping 28 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