Blink handle selection handle visibility

ui/touch_selection/touch_selection_controller.cc

 // Copyright 2014 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/touch_selection/touch_selection_controller.h"
 
 #include "base/auto_reset.h"
 #include "base/logging.h"
 #include "base/metrics/histogram_macros.h"
 #include "base/metrics/user_metrics.h"
@@ skipping 44 matching lines @@
 TouchSelectionController::TouchSelectionController(
     TouchSelectionControllerClient* client,
     const Config& config)
     : client_(client),
       config_(config),
       force_next_update_(false),
       response_pending_input_event_(INPUT_EVENT_TYPE_NONE),
       start_orientation_(TouchHandleOrientation::UNDEFINED),
       end_orientation_(TouchHandleOrientation::UNDEFINED),
       active_status_(INACTIVE),
-      activate_insertion_automatically_(false),
-      activate_selection_automatically_(false),
       selection_empty_(false),
       selection_editable_(false),
       temporarily_hidden_(false),
       anchor_drag_to_selection_start_(false),
       longpress_drag_selector_(this),
       selection_handle_dragged_(false) {
   DCHECK(client_);
 }
 
 TouchSelectionController::~TouchSelectionController() {
 }
 
 void TouchSelectionController::OnSelectionBoundsChanged(
     const gfx::SelectionBound& start,
-    const gfx::SelectionBound& end) {
+    const gfx::SelectionBound& end,
+    bool is_handle_visible) {
   if (!force_next_update_ && start == start_ && end_ == end)
     return;
 
   // Notify if selection bounds have just been established or dissolved.
   if (start.type() != gfx::SelectionBound::EMPTY &&
       start_.type() == gfx::SelectionBound::EMPTY) {
     client_->OnSelectionEvent(SELECTION_ESTABLISHED);
   } else if (start.type() == gfx::SelectionBound::EMPTY &&
              start_.type() != gfx::SelectionBound::EMPTY) {
     client_->OnSelectionEvent(SELECTION_DISSOLVED);
   }
 
   // Swap the Handles when the start and end selection points cross each other.
   if (active_status_ == SELECTION_ACTIVE) {
     if ((start_selection_handle_->IsActive() &&
          end_.edge_bottom() == start.edge_bottom()) ||
         (end_selection_handle_->IsActive() &&
          end.edge_bottom() == start_.edge_bottom())) {
       start_selection_handle_.swap(end_selection_handle_);
     }
   }
 
   start_ = start;
   end_ = end;
   start_orientation_ = ToTouchHandleOrientation(start_.type());
   end_orientation_ = ToTouchHandleOrientation(end_.type());
   force_next_update_ = false;
 
-  if (!activate_selection_automatically_ &&
-      !activate_insertion_automatically_) {
-    DCHECK_EQ(INACTIVE, active_status_);
-    DCHECK_EQ(INPUT_EVENT_TYPE_NONE, response_pending_input_event_);
+  if (!is_handle_visible) {
+    DeactivateSelection();
+    DeactivateInsertion();
     return;
   }
 
   // Ensure that |response_pending_input_event_| is cleared after the method
   // completes, while also making its current value available for the duration
   // of the call.
   InputEventType causal_input_event = response_pending_input_event_;
   response_pending_input_event_ = INPUT_EVENT_TYPE_NONE;
   base::AutoReset<InputEventType> auto_reset_response_pending_input_event(
       &response_pending_input_event_, causal_input_event);
@@ skipping 80 matching lines @@
       return start_selection_handle_->WillHandleTouchEvent(event);
     }
     return end_selection_handle_->WillHandleTouchEvent(event);
   }
 
   return false;
 }
 
 bool TouchSelectionController::WillHandleTapEvent(const gfx::PointF& location,
                                                   int tap_count) {
-  if (WillHandleTapOrLongPress(location))
-    return true;
-
   if (tap_count > 1) {
     response_pending_input_event_ = REPEATED_TAP;
-    ShowSelectionHandlesAutomatically();
   } else {
     response_pending_input_event_ = TAP;
-    if (active_status_ != SELECTION_ACTIVE)
-      activate_selection_automatically_ = false;
   }
-  ShowInsertionHandleAutomatically();
   if (selection_empty_ && !config_.show_on_tap_for_empty_editable)
     DeactivateInsertion();
   ForceNextUpdateIfInactive();
   return false;
 }
 
 bool TouchSelectionController::WillHandleLongPressEvent(
     base::TimeTicks event_time,
     const gfx::PointF& location) {
-  if (WillHandleTapOrLongPress(location))
-    return true;
-
   longpress_drag_selector_.OnLongPressEvent(event_time, location);
   response_pending_input_event_ = LONG_PRESS;
-  ShowSelectionHandlesAutomatically();
-  ShowInsertionHandleAutomatically();
   ForceNextUpdateIfInactive();
   return false;
 }
 
 void TouchSelectionController::OnScrollBeginEvent() {
   // When there is an active selection, if the user performs a long-press that
   // does not trigger a new selection (e.g. a long-press on an empty area) and
   // then scrolls, the scroll will move the selection. In this case we will
   // think incorrectly that the selection change was due to the long-press and
   // will activate touch selection and start long-press drag gesture (see
   // ActivateInsertionIfNecessary()). To prevent this, we need to reset the
   // state of touch selection controller and long-press drag selector.
   // TODO(mohsen): Remove this workaround when we have enough information about
   // the cause of a selection change (see https://crbug.com/571897).
   longpress_drag_selector_.OnScrollBeginEvent();
   response_pending_input_event_ = INPUT_EVENT_TYPE_NONE;
-  if (active_status_ == INACTIVE) {
-    activate_insertion_automatically_ = false;
-    activate_selection_automatically_ = false;
-  }
-}
-
-void TouchSelectionController::AllowShowingFromCurrentSelection() {
-  if (active_status_ != INACTIVE)
-    return;
-
-  activate_selection_automatically_ = true;
-  activate_insertion_automatically_ = true;
-  if (GetStartPosition() != GetEndPosition()) {
-    OnSelectionChanged();
-  } else if (start_orientation_ == TouchHandleOrientation::CENTER &&
-             selection_editable_) {
-    OnInsertionChanged();
-  }
 }
 
 void TouchSelectionController::HideAndDisallowShowingAutomatically() {
   response_pending_input_event_ = INPUT_EVENT_TYPE_NONE;
   DeactivateInsertion();
   DeactivateSelection();
-  activate_insertion_automatically_ = false;
-  activate_selection_automatically_ = false;
 }
 
 void TouchSelectionController::SetTemporarilyHidden(bool hidden) {
   if (temporarily_hidden_ == hidden)
     return;
   temporarily_hidden_ = hidden;
   RefreshHandleVisibility();
 }
 
 void TouchSelectionController::OnSelectionEditable(bool editable) {
@@ skipping 161 matching lines @@
 }
 
 gfx::PointF TouchSelectionController::GetSelectionStart() const {
   return GetStartPosition();
 }
 
 gfx::PointF TouchSelectionController::GetSelectionEnd() const {
   return GetEndPosition();
 }
 
-void TouchSelectionController::ShowInsertionHandleAutomatically() {
-  if (activate_insertion_automatically_)
-    return;
-  activate_insertion_automatically_ = true;
-  ForceNextUpdateIfInactive();
-}
-
-void TouchSelectionController::ShowSelectionHandlesAutomatically() {
-  if (activate_selection_automatically_)
-    return;
-  activate_selection_automatically_ = true;
-  ForceNextUpdateIfInactive();
-}
-
-bool TouchSelectionController::WillHandleTapOrLongPress(
-    const gfx::PointF& location) {
-  // If there is an active selection that was not triggered by a user gesture,
-  // allow showing the handles for that selection if a gesture occurs within
-  // the selection rect. Note that this hit test is at best a crude
-  // approximation, and may swallow taps that actually fall outside the
-  // real selection.
-  if (active_status_ == INACTIVE &&
-      GetStartPosition() != GetEndPosition() &&
-      RectFBetweenSelectionBounds(start_, end_).Contains(location)) {
-    AllowShowingFromCurrentSelection();
-    return true;
-  }
-  return false;
-}
-
 void TouchSelectionController::OnInsertionChanged() {
   DeactivateSelection();
 
   if ((response_pending_input_event_ == TAP ||
        response_pending_input_event_ == REPEATED_TAP) &&
       selection_empty_ && !config_.show_on_tap_for_empty_editable) {
     HideAndDisallowShowingAutomatically();
     return;
   }
 
-  if (!activate_insertion_automatically_)
-    return;
-
   const bool activated = ActivateInsertionIfNecessary();
 
   const TouchHandle::AnimationStyle animation = GetAnimationStyle(!activated);
   insertion_handle_->SetFocus(start_.edge_top(), start_.edge_bottom());
   insertion_handle_->SetVisible(GetStartVisible(), animation);
 
   UpdateHandleLayoutIfNecessary();
 
   client_->OnSelectionEvent(activated ? INSERTION_HANDLE_SHOWN
                                       : INSERTION_HANDLE_MOVED);
 }
 
 void TouchSelectionController::OnSelectionChanged() {
   DeactivateInsertion();
 
-  if (!activate_selection_automatically_)
-    return;
-
   const bool activated = ActivateSelectionIfNecessary();
 
   const TouchHandle::AnimationStyle animation = GetAnimationStyle(!activated);
 
   start_selection_handle_->SetFocus(start_.edge_top(), start_.edge_bottom());
   end_selection_handle_->SetFocus(end_.edge_top(), end_.edge_bottom());
 
   start_selection_handle_->SetOrientation(start_orientation_);
   end_selection_handle_->SetOrientation(end_orientation_);
 
@@ skipping 159 matching lines @@
     base::TimeDelta duration = base::TimeTicks::Now() - selection_start_time_;
     UMA_HISTOGRAM_CUSTOM_TIMES("Event.TouchSelection.WasDraggedDuration",
                                duration,
                                base::TimeDelta::FromMilliseconds(500),
                                base::TimeDelta::FromSeconds(60),
                                60);
   }
 }
 
 }  // namespace ui