Add Aura handles to be used in unified touch selection

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"
 
@@ skipping 34 matching lines @@
     base::TimeDelta tap_timeout,
     float tap_slop,
     bool show_on_tap_for_empty_editable)
     : client_(client),
       tap_timeout_(tap_timeout),
       tap_slop_(tap_slop),
       show_on_tap_for_empty_editable_(show_on_tap_for_empty_editable),
       response_pending_input_event_(INPUT_EVENT_TYPE_NONE),
       start_orientation_(TouchHandleOrientation::UNDEFINED),
       end_orientation_(TouchHandleOrientation::UNDEFINED),
-      is_insertion_active_(false),
+      active_status_(INACTIVE),
       activate_insertion_automatically_(false),
-      is_selection_active_(false),
       activate_selection_automatically_(false),
       selection_empty_(false),
       selection_editable_(false),
       temporarily_hidden_(false),
       selection_handle_dragged_(false) {
   DCHECK(client_);
 }
 
 TouchSelectionController::~TouchSelectionController() {
 }
@@ skipping 16 matching lines @@
   }
 
   // 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);
 
-  const bool is_selection_dragging =
-      is_selection_active_ && (start_selection_handle_->is_dragging() ||
-                               end_selection_handle_->is_dragging());
+  const bool is_selection_dragging = active_status_ == SELECTION_ACTIVE &&
+                                     (start_selection_handle_->is_dragging() ||
+                                      end_selection_handle_->is_dragging());
 
   // It's possible that the bounds temporarily overlap while a selection handle
   // is being dragged, incorrectly reporting a CENTER orientation.
   // TODO(jdduke): This safeguard is racy, as it's possible the delayed response
   // from handle positioning occurs *after* the handle dragging has ceased.
   // Instead, prevent selection -> insertion transitions without an intervening
   // action or selection clearing of some sort, crbug.com/392696.
   if (is_selection_dragging) {
     if (start_orientation_ == TouchHandleOrientation::CENTER)
       start_orientation_ = start_selection_handle_->orientation();
@@ skipping 12 matching lines @@
   if (start_orientation_ == TouchHandleOrientation::CENTER &&
       selection_editable_) {
     OnInsertionChanged();
     return;
   }
 
   HideAndDisallowShowingAutomatically();
 }
 
 bool TouchSelectionController::WillHandleTouchEvent(const MotionEvent& event) {
-  if (is_insertion_active_) {
+  if (active_status_ == INSERTION_ACTIVE) {
     DCHECK(insertion_handle_);
     return insertion_handle_->WillHandleTouchEvent(event);
   }
 
-  if (is_selection_active_) {
+  if (active_status_ == SELECTION_ACTIVE) {
     DCHECK(start_selection_handle_);
     DCHECK(end_selection_handle_);
     if (start_selection_handle_->is_dragging())
       return start_selection_handle_->WillHandleTouchEvent(event);
 
     if (end_selection_handle_->is_dragging())
       return end_selection_handle_->WillHandleTouchEvent(event);
 
     const gfx::PointF event_pos(event.GetX(), event.GetY());
     if ((event_pos - GetStartPosition()).LengthSquared() <=
-        (event_pos - GetEndPosition()).LengthSquared())
+        (event_pos - GetEndPosition()).LengthSquared()) {
       return start_selection_handle_->WillHandleTouchEvent(event);
-    else
-      return end_selection_handle_->WillHandleTouchEvent(event);
+    }
+    return end_selection_handle_->WillHandleTouchEvent(event);
   }
 
   return false;
 }
 
 void TouchSelectionController::OnLongPressEvent() {
   response_pending_input_event_ = LONG_PRESS;
   ShowSelectionHandlesAutomatically();
   ShowInsertionHandleAutomatically();
   ResetCachedValuesIfInactive();
 }
 
 void TouchSelectionController::AllowShowingFromCurrentSelection() {
-  if (is_selection_active_ || is_insertion_active_)
+  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();

[sadrul, 2015/05/11 16:06:57]

Add braces in this block.

[mohsen, 2015/05/11 16:55:40]

Done.

 }
 
 void TouchSelectionController::OnTapEvent() {
   response_pending_input_event_ = TAP;
   activate_selection_automatically_ = false;
   ShowInsertionHandleAutomatically();
   if (selection_empty_ && !show_on_tap_for_empty_editable_)
     DeactivateInsertion();
   ResetCachedValuesIfInactive();
 }
 
 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;
 
   TouchHandle::AnimationStyle animation_style = GetAnimationStyle(true);
-  if (is_selection_active_) {
+  if (active_status_ == SELECTION_ACTIVE) {
     start_selection_handle_->SetVisible(GetStartVisible(), animation_style);
     end_selection_handle_->SetVisible(GetEndVisible(), animation_style);
+  } else if (active_status_ == INSERTION_ACTIVE) {
+    insertion_handle_->SetVisible(GetStartVisible(), animation_style);
   }
-  if (is_insertion_active_)
-    insertion_handle_->SetVisible(GetStartVisible(), animation_style);
 }
 
 void TouchSelectionController::OnSelectionEditable(bool editable) {
   if (selection_editable_ == editable)
     return;
   selection_editable_ = editable;
   ResetCachedValuesIfInactive();
   if (!selection_editable_)
     DeactivateInsertion();
 }
 
 void TouchSelectionController::OnSelectionEmpty(bool empty) {
   if (selection_empty_ == empty)
     return;
   selection_empty_ = empty;
   ResetCachedValuesIfInactive();
 }
 
 bool TouchSelectionController::Animate(base::TimeTicks frame_time) {
-  if (is_insertion_active_)
+  if (active_status_ == INSERTION_ACTIVE)
     return insertion_handle_->Animate(frame_time);
 
-  if (is_selection_active_) {
+  if (active_status_ == SELECTION_ACTIVE) {
     bool needs_animate = start_selection_handle_->Animate(frame_time);
     needs_animate |= end_selection_handle_->Animate(frame_time);
     return needs_animate;
   }
 
   return false;
 }
 
 gfx::RectF TouchSelectionController::GetRectBetweenBounds() const {
   // Short-circuit for efficiency.
-  if (!is_insertion_active_ && !is_selection_active_)
+  if (active_status_ == INACTIVE)
     return gfx::RectF();
 
   if (start_.visible() && !end_.visible())
     return gfx::BoundingRect(start_.edge_top(), start_.edge_bottom());
 
   if (end_.visible() && !start_.visible())
     return gfx::BoundingRect(end_.edge_top(), end_.edge_bottom());
 
   // If both handles are visible, or both are invisible, use the entire rect.
   return RectFBetweenSelectionBounds(start_, end_);
 }
 
 gfx::RectF TouchSelectionController::GetStartHandleRect() const {
-  if (is_insertion_active_)
+  if (active_status_ == INSERTION_ACTIVE)
     return insertion_handle_->GetVisibleBounds();
-  if (is_selection_active_)
+  if (active_status_ == SELECTION_ACTIVE)
     return start_selection_handle_->GetVisibleBounds();
   return gfx::RectF();
 }
 
 gfx::RectF TouchSelectionController::GetEndHandleRect() const {
-  if (is_insertion_active_)
+  if (active_status_ == INSERTION_ACTIVE)
     return insertion_handle_->GetVisibleBounds();
-  if (is_selection_active_)
+  if (active_status_ == SELECTION_ACTIVE)
     return end_selection_handle_->GetVisibleBounds();
   return gfx::RectF();
 }
 
 const gfx::PointF& TouchSelectionController::GetStartPosition() const {
   return start_.edge_bottom();
 }
 
 const gfx::PointF& TouchSelectionController::GetEndPosition() const {
   return end_.edge_bottom();
@@ skipping 22 matching lines @@
 }
 
 void TouchSelectionController::OnHandleDragUpdate(const TouchHandle& handle,
                                                   const gfx::PointF& position) {
   // As the position corresponds to the bottom left point of the selection
   // bound, offset it by half the corresponding line height.
   gfx::Vector2dF line_offset = &handle == start_selection_handle_.get()
                                    ? GetStartLineOffset()
                                    : GetEndLineOffset();
   gfx::PointF line_position = position + line_offset;
-  if (&handle == insertion_handle_.get()) {
+  if (&handle == insertion_handle_.get())
     client_->MoveCaret(line_position);
-  } else {
+  else
     client_->MoveRangeSelectionExtent(line_position);
-  }
 }
 
 void TouchSelectionController::OnHandleDragEnd(const TouchHandle& handle) {
   if (&handle == insertion_handle_.get())
     client_->OnSelectionEvent(INSERTION_DRAG_STOPPED);
   else
     client_->OnSelectionEvent(SELECTION_DRAG_STOPPED);
 }
 
 void TouchSelectionController::OnHandleTapped(const TouchHandle& handle) {
@@ skipping 36 matching lines @@
 
   if (response_pending_input_event_ == TAP && selection_empty_ &&
       !show_on_tap_for_empty_editable_) {
     HideAndDisallowShowingAutomatically();
     return;
   }
 
   if (!activate_insertion_automatically_)
     return;
 
-  const bool was_active = is_insertion_active_;
+  const bool was_active = active_status_ == INSERTION_ACTIVE;
   const gfx::PointF position = GetStartPosition();
-  if (!is_insertion_active_)
+  if (!was_active)
     ActivateInsertion();
   else
     client_->OnSelectionEvent(INSERTION_MOVED);
 
   insertion_handle_->SetVisible(GetStartVisible(),
                                 GetAnimationStyle(was_active));
   insertion_handle_->SetPosition(position);
 }
 
 void TouchSelectionController::OnSelectionChanged() {
   DeactivateInsertion();
 
   if (!activate_selection_automatically_)
     return;
 
-  const bool was_active = is_selection_active_;
-  if (!is_selection_active_ || response_pending_input_event_ == LONG_PRESS)
+  const bool was_active = active_status_ == SELECTION_ACTIVE;
+  if (!was_active || response_pending_input_event_ == LONG_PRESS)
     ActivateSelection();
   else
     client_->OnSelectionEvent(SELECTION_MOVED);
 
   const TouchHandle::AnimationStyle animation = GetAnimationStyle(was_active);
   start_selection_handle_->SetVisible(GetStartVisible(), animation);
   end_selection_handle_->SetVisible(GetEndVisible(), animation);
 
   start_selection_handle_->SetPosition(GetStartPosition());
   end_selection_handle_->SetPosition(GetEndPosition());
 }
 
 void TouchSelectionController::ActivateInsertion() {
-  DCHECK(!is_selection_active_);
+  DCHECK_NE(SELECTION_ACTIVE, active_status_);
 
   if (!insertion_handle_)
     insertion_handle_.reset(
         new TouchHandle(this, TouchHandleOrientation::CENTER));
 
-  if (!is_insertion_active_) {
-    is_insertion_active_ = true;
+  if (active_status_ == INACTIVE) {
+    active_status_ = INSERTION_ACTIVE;
     insertion_handle_->SetEnabled(true);
     client_->OnSelectionEvent(INSERTION_SHOWN);
   }
 }
 
 void TouchSelectionController::DeactivateInsertion() {
-  if (!is_insertion_active_)
+  if (active_status_ != INSERTION_ACTIVE)
     return;
   DCHECK(insertion_handle_);
-  is_insertion_active_ = false;
+  active_status_ = INACTIVE;
   insertion_handle_->SetEnabled(false);
   client_->OnSelectionEvent(INSERTION_CLEARED);
 }
 
 void TouchSelectionController::ActivateSelection() {
-  DCHECK(!is_insertion_active_);
+  DCHECK_NE(INSERTION_ACTIVE, active_status_);
 
   if (!start_selection_handle_) {
     start_selection_handle_.reset(new TouchHandle(this, start_orientation_));
   } else {
     start_selection_handle_->SetEnabled(true);
     start_selection_handle_->SetOrientation(start_orientation_);
   }
 
   if (!end_selection_handle_) {
     end_selection_handle_.reset(new TouchHandle(this, end_orientation_));
   } else {
     end_selection_handle_->SetEnabled(true);
     end_selection_handle_->SetOrientation(end_orientation_);
   }
 
   // As a long press received while a selection is already active may trigger
   // an entirely new selection, notify the client but avoid sending an
   // intervening SELECTION_CLEARED update to avoid unnecessary state changes.
-  if (!is_selection_active_ || response_pending_input_event_ == LONG_PRESS) {
-    if (is_selection_active_) {
+  if (active_status_ == INACTIVE ||
+      response_pending_input_event_ == LONG_PRESS) {
+    if (active_status_ == SELECTION_ACTIVE) {
       // The active selection session finishes with the start of the new one.
       LogSelectionEnd();
     }
-    is_selection_active_ = true;
+    active_status_ = SELECTION_ACTIVE;
     selection_handle_dragged_ = false;
     selection_start_time_ = base::TimeTicks::Now();
     response_pending_input_event_ = INPUT_EVENT_TYPE_NONE;
     client_->OnSelectionEvent(SELECTION_SHOWN);
   }
 }
 
 void TouchSelectionController::DeactivateSelection() {
-  if (!is_selection_active_)
+  if (active_status_ != SELECTION_ACTIVE)
     return;
   DCHECK(start_selection_handle_);
   DCHECK(end_selection_handle_);
   LogSelectionEnd();
   start_selection_handle_->SetEnabled(false);
   end_selection_handle_->SetEnabled(false);
-  is_selection_active_ = false;
+  active_status_ = INACTIVE;
   client_->OnSelectionEvent(SELECTION_CLEARED);
 }
 
 void TouchSelectionController::ResetCachedValuesIfInactive() {
-  if (is_selection_active_ || is_insertion_active_)
+  if (active_status_ != INACTIVE)
     return;
   start_ = SelectionBound();
   end_ = SelectionBound();
   start_orientation_ = TouchHandleOrientation::UNDEFINED;
   end_orientation_ = TouchHandleOrientation::UNDEFINED;
 }
 
 gfx::Vector2dF TouchSelectionController::GetStartLineOffset() const {
   return ComputeLineOffsetFromBottom(start_);
 }
@@ skipping 26 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