Implementing directional text selection handles

content/browser/web_contents/touch_editable_impl_aura.cc

 // Copyright (c) 2013 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 "content/browser/web_contents/touch_editable_impl_aura.h"
 
 #include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/browser/renderer_host/render_widget_host_view_aura.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/common/view_messages.h"
@@ skipping 34 matching lines @@
 
   rwhva_ = view;
   rwhva_->set_touch_editing_client(this);
 }
 
 void TouchEditableImplAura::UpdateEditingController() {
   if (!rwhva_ || !rwhva_->HasFocus())
     return;
 
   if (text_input_type_ != ui::TEXT_INPUT_TYPE_NONE ||
-      selection_anchor_rect_ != selection_focus_rect_) {
+      selection_anchor_ != selection_focus_) {
     if (touch_selection_controller_)
       touch_selection_controller_->SelectionChanged();
   } else {
     EndTouchEditing(false);
   }
 }
 
 void TouchEditableImplAura::OverscrollStarted() {
   scrolls_in_progress_++;
 }
@@ skipping 23 matching lines @@
     if (touch_selection_controller_->IsHandleDragInProgress()) {
       touch_selection_controller_->SelectionChanged();
     } else {
       selection_gesture_in_process_ = false;
       touch_selection_controller_->HideHandles(quick);
       touch_selection_controller_.reset();
     }
   }
 }
 
-void TouchEditableImplAura::OnSelectionOrCursorChanged(const gfx::Rect& anchor,
-                                                       const gfx::Rect& focus) {
-  selection_anchor_rect_ = anchor;
-  selection_focus_rect_ = focus;
+void TouchEditableImplAura::OnSelectionOrCursorChanged(
+    const ui::SelectionBound& anchor,
+    const ui::SelectionBound& focus) {
+  selection_anchor_ = anchor;
+  selection_focus_ = focus;
 
   // If touch editing handles were not visible, we bring them up only if the
   // current event is a gesture event, no scroll/fling/overscoll is in progress,
   // and there is non-zero selection on the page
   if (selection_gesture_in_process_ && !scrolls_in_progress_ &&
-      selection_anchor_rect_ != selection_focus_rect_) {
+      selection_anchor_ != selection_focus_) {
     StartTouchEditing();
     selection_gesture_in_process_ = false;
   }
 
   UpdateEditingController();
 }
 
 void TouchEditableImplAura::OnTextInputTypeChanged(ui::TextInputType type) {
   text_input_type_ = type;
 }
 
 bool TouchEditableImplAura::HandleInputEvent(const ui::Event* event) {
   DCHECK(rwhva_);
   if (!event->IsGestureEvent()) {
     // Ignore all non-gesture events. Non-gesture events that can deactivate
     // touch editing are handled in TouchSelectionControllerImpl.
     return false;
   }
 
   const ui::GestureEvent* gesture_event =
       static_cast<const ui::GestureEvent*>(event);
   switch (event->type()) {
     case ui::ET_GESTURE_TAP:
       // When the user taps, we want to show touch editing handles if user
       // tapped on selected text.
       if (gesture_event->details().tap_count() == 1 &&
-          selection_anchor_rect_ != selection_focus_rect_) {
-        // UnionRects only works for rects with non-zero width.
-        gfx::Rect anchor(selection_anchor_rect_.origin(),
-                         gfx::Size(1, selection_anchor_rect_.height()));
-        gfx::Rect focus(selection_focus_rect_.origin(),
-                        gfx::Size(1, selection_focus_rect_.height()));
-        gfx::Rect selection_rect = gfx::UnionRects(anchor, focus);
+          selection_anchor_ != selection_focus_) {
+        gfx::Rect selection_rect =
+            ui::RectBetweenSelectionBounds(selection_anchor_, selection_focus_);
         if (selection_rect.Contains(gesture_event->location())) {
           StartTouchEditing();
           return true;
         }
       }
       // For single taps, not inside selected region, we want to show handles
       // only when the tap is on an already focused textfield.
       textfield_was_focused_on_tap_ =
           gesture_event->details().tap_count() == 1 &&
           text_input_type_ != ui::TEXT_INPUT_TYPE_NONE;
@@ skipping 56 matching lines @@
 
 void TouchEditableImplAura::MoveCaretTo(const gfx::Point& point) {
   if (!rwhva_)
     return;
 
   RenderWidgetHostImpl* host = RenderWidgetHostImpl::From(
       rwhva_->GetRenderWidgetHost());
   host->MoveCaret(point);
 }
 
-void TouchEditableImplAura::GetSelectionEndPoints(gfx::Rect* p1,
-                                                  gfx::Rect* p2) {
-  *p1 = selection_anchor_rect_;
-  *p2 = selection_focus_rect_;
+void TouchEditableImplAura::GetSelectionEndPoints(ui::SelectionBound* anchor,
+                                                  ui::SelectionBound* focus) {
+  *anchor = selection_anchor_;
+  *focus = selection_focus_;
 }
 
 gfx::Rect TouchEditableImplAura::GetBounds() {
   return rwhva_ ? gfx::Rect(rwhva_->GetNativeView()->bounds().size()) :
       gfx::Rect();
 }
 
 gfx::NativeView TouchEditableImplAura::GetNativeView() const {
   return rwhva_ ? rwhva_->GetNativeView()->GetToplevelWindow() : NULL;
 }
@@ skipping 114 matching lines @@
       handles_hidden_due_to_scroll_(false),
       scrolls_in_progress_(0),
       textfield_was_focused_on_tap_(false) {
 }
 
 void TouchEditableImplAura::ScrollEnded() {
   scrolls_in_progress_--;
   // If there is no scrolling left in progress, show selection handles if they
   // were hidden due to scroll and there is a selection.
   if (!scrolls_in_progress_ && handles_hidden_due_to_scroll_ &&
-      (selection_anchor_rect_ != selection_focus_rect_ ||
+      (selection_anchor_ != selection_focus_ ||
           text_input_type_ != ui::TEXT_INPUT_TYPE_NONE)) {
     StartTouchEditing();
     UpdateEditingController();
     handles_hidden_due_to_scroll_ = false;
   }
 }
 
 void TouchEditableImplAura::Cleanup() {
   if (rwhva_) {
     rwhva_->set_touch_editing_client(NULL);
     rwhva_ = NULL;
   }
   text_input_type_ = ui::TEXT_INPUT_TYPE_NONE;
   EndTouchEditing(true);
   selection_gesture_in_process_ = false;
   handles_hidden_due_to_scroll_ = false;
   scrolls_in_progress_ = 0;
 }
 
 }  // namespace content