Prevent repeated taps from resetting insertion handle position

content/browser/renderer_host/input/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 "content/browser/renderer_host/input/touch_selection_controller.h"
 
 #include "base/logging.h"
 #include "third_party/WebKit/public/web/WebInputEvent.h"
 
 namespace content {
@@ skipping 102 matching lines @@
       return end_selection_handle_->WillHandleTouchEvent(event);
   }
 
   return false;
 }
 
 void TouchSelectionController::OnLongPressEvent() {
   last_input_event_type_ = LONG_PRESS;
   ShowSelectionHandlesAutomatically();
   ShowInsertionHandleAutomatically();
-  ResetCachedValues();
+  ResetCachedValuesIfInactive();
 }
 
 void TouchSelectionController::OnTapEvent() {
   last_input_event_type_ = TAP;
   activate_selection_automatically_ = false;
   DeactivateSelection();
   ShowInsertionHandleAutomatically();
-  ResetCachedValues();
+  ResetCachedValuesIfInactive();
 }
 
 void TouchSelectionController::HideAndDisallowShowingAutomatically() {
   last_input_event_type_ = 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_) {
     start_selection_handle_->SetVisible(GetStartVisible(), animation_style);
     end_selection_handle_->SetVisible(GetEndVisible(), 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;
-  ResetCachedValues();
+  ResetCachedValuesIfInactive();
   if (!selection_editable_)
     DeactivateInsertion();
 }
 
 void TouchSelectionController::OnSelectionEmpty(bool empty) {
   if (selection_empty_ == empty)
     return;
   selection_empty_ = empty;
-  ResetCachedValues();
+  ResetCachedValuesIfInactive();
 }
 
 bool TouchSelectionController::Animate(base::TimeTicks frame_time) {
   if (is_insertion_active_)
     return insertion_handle_->Animate(frame_time);
 
   if (is_selection_active_) {
     bool needs_animate = start_selection_handle_->Animate(frame_time);
     needs_animate |= end_selection_handle_->Animate(frame_time);
     return needs_animate;
@@ skipping 43 matching lines @@
 }
 
 scoped_ptr<TouchHandleDrawable> TouchSelectionController::CreateDrawable() {
   return client_->CreateDrawable();
 }
 
 void TouchSelectionController::ShowInsertionHandleAutomatically() {
   if (activate_insertion_automatically_)
     return;
   activate_insertion_automatically_ = true;
-  if (!is_insertion_active_ && !is_selection_active_)
-    ResetCachedValues();
+  ResetCachedValuesIfInactive();
 }
 
 void TouchSelectionController::ShowSelectionHandlesAutomatically() {
   if (activate_selection_automatically_)
     return;
   activate_selection_automatically_ = true;
-  if (!is_insertion_active_ && !is_selection_active_)
-    ResetCachedValues();
+  ResetCachedValuesIfInactive();
 }
 
 void TouchSelectionController::OnInsertionChanged() {
   DeactivateSelection();
 
   if (last_input_event_type_ == TAP && selection_empty_) {
     HideAndDisallowShowingAutomatically();
     return;
   }
 
@@ skipping 78 matching lines @@
   if (!is_selection_active_)
     return;
   DCHECK(start_selection_handle_);
   DCHECK(end_selection_handle_);
   start_selection_handle_->SetEnabled(false);
   end_selection_handle_->SetEnabled(false);
   is_selection_active_ = false;
   client_->OnSelectionEvent(SELECTION_CLEARED, gfx::PointF());
 }
 
-void TouchSelectionController::ResetCachedValues() {
+void TouchSelectionController::ResetCachedValuesIfInactive() {
+  if (is_selection_active_ || is_insertion_active_)
+    return;
   start_rect_ = gfx::RectF();
   end_rect_ = gfx::RectF();
   start_orientation_ = TOUCH_HANDLE_ORIENTATION_UNDEFINED;
   end_orientation_ = TOUCH_HANDLE_ORIENTATION_UNDEFINED;
   start_visible_ = false;
   end_visible_ = false;
 }
 
 gfx::PointF TouchSelectionController::GetStartPosition() const {
   return start_rect_.bottom_left();
@@ skipping 20 matching lines @@
 }
 
 TouchHandle::AnimationStyle TouchSelectionController::GetAnimationStyle(
     bool was_active) const {
   return was_active && client_->SupportsAnimation()
              ? TouchHandle::ANIMATION_SMOOTH
              : TouchHandle::ANIMATION_NONE;
 }
 
 }  // namespace content