aw: Ensure synchronization of PopupWindow handle visibility/position

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 371 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 = active_status_ == INSERTION_ACTIVE;
-  const gfx::PointF position = GetStartPosition();
-  if (!was_active)
-    ActivateInsertion();
-  else
-    client_->OnSelectionEvent(INSERTION_MOVED);
+  const bool activated = ActivateInsertionIfNecessary();
 
-  insertion_handle_->SetVisible(GetStartVisible(),
-                                GetAnimationStyle(was_active));
-  insertion_handle_->SetPosition(position);
+  const TouchHandle::AnimationStyle animation = GetAnimationStyle(!activated);
+  insertion_handle_->SetVisible(GetStartVisible(), animation);
+  insertion_handle_->SetPosition(GetStartPosition());
+
+  client_->OnSelectionEvent(activated ? INSERTION_SHOWN : INSERTION_MOVED);
 }
 
 void TouchSelectionController::OnSelectionChanged() {
   DeactivateInsertion();
 
   if (!activate_selection_automatically_)
     return;
 
-  const bool was_active = active_status_ == SELECTION_ACTIVE;
-  if (!was_active || response_pending_input_event_ == LONG_PRESS)
-    ActivateSelection();
-  else
-    client_->OnSelectionEvent(SELECTION_MOVED);
+  const bool activated = ActivateSelectionIfNecessary();
 
-  const TouchHandle::AnimationStyle animation = GetAnimationStyle(was_active);
+  const TouchHandle::AnimationStyle animation = GetAnimationStyle(!activated);
   start_selection_handle_->SetVisible(GetStartVisible(), animation);
   end_selection_handle_->SetVisible(GetEndVisible(), animation);
-
   start_selection_handle_->SetPosition(GetStartPosition());
   end_selection_handle_->SetPosition(GetEndPosition());
+
+  client_->OnSelectionEvent(activated ? SELECTION_SHOWN : SELECTION_MOVED);
 }
 
-void TouchSelectionController::ActivateInsertion() {
+bool TouchSelectionController::ActivateInsertionIfNecessary() {
   DCHECK_NE(SELECTION_ACTIVE, active_status_);
 
-  if (!insertion_handle_)
+  if (!insertion_handle_) {
     insertion_handle_.reset(
         new TouchHandle(this, TouchHandleOrientation::CENTER));
+  }
 
   if (active_status_ == INACTIVE) {
     active_status_ = INSERTION_ACTIVE;
     insertion_handle_->SetEnabled(true);
-    client_->OnSelectionEvent(INSERTION_SHOWN);
+    return true;
   }
+  return false;
 }
 
 void TouchSelectionController::DeactivateInsertion() {
   if (active_status_ != INSERTION_ACTIVE)
     return;
   DCHECK(insertion_handle_);
   active_status_ = INACTIVE;
   insertion_handle_->SetEnabled(false);
   client_->OnSelectionEvent(INSERTION_CLEARED);
 }
 
-void TouchSelectionController::ActivateSelection() {
+bool TouchSelectionController::ActivateSelectionIfNecessary() {
   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 (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();
     }
     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);
+    return true;
   }
+  return false;
 }
 
 void TouchSelectionController::DeactivateSelection() {
   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);
@@ skipping 44 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