Fix touch editing handles not shown after trying overscroll

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 44 matching lines @@
   if (text_input_type_ != ui::TEXT_INPUT_TYPE_NONE ||
       selection_anchor_ != selection_focus_) {
     if (touch_selection_controller_)
       touch_selection_controller_->SelectionChanged();
   } else {
     EndTouchEditing(false);
   }
 }
 
 void TouchEditableImplAura::OverscrollStarted() {
-  scrolls_in_progress_++;
+  overscroll_in_progress_ = true;
 }
 
 void TouchEditableImplAura::OverscrollCompleted() {
-  ScrollEnded();
+  overscroll_in_progress_ = false;
+  StartTouchEditingIfNecessary();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TouchEditableImplAura, RenderWidgetHostViewAura::TouchEditingClient
 // implementation:
 
 void TouchEditableImplAura::StartTouchEditing() {
   if (!rwhva_ || !rwhva_->HasFocus())
     return;
 
@@ skipping 19 matching lines @@
 
 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_ != selection_focus_) {
+  if (selection_gesture_in_process_ && !scroll_in_progress_ &&
+      !overscroll_in_progress_ && selection_anchor_ != selection_focus_) {
     StartTouchEditing();
     selection_gesture_in_process_ = false;
   }
 
   UpdateEditingController();
 }
 
 void TouchEditableImplAura::OnTextInputTypeChanged(ui::TextInputType type) {
   text_input_type_ = type;
 }
@@ skipping 30 matching lines @@
       // 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;
       break;
     case ui::ET_GESTURE_LONG_PRESS:
       selection_gesture_in_process_ = true;
       break;
     case ui::ET_GESTURE_SCROLL_BEGIN:
-      scrolls_in_progress_++;
+      scroll_in_progress_ = true;;
       // We need to hide selection handles during scroll (including fling and
       // overscroll), but they should be re-activated after scrolling if:
       //  - an existing scroll decided that handles should be shown after
       //    scrolling; or
       //  - the gesture in progress is going to end in selection; or
       //  - selection handles are currently active.
       handles_hidden_due_to_scroll_ = handles_hidden_due_to_scroll_ ||
                                       selection_gesture_in_process_ ||
                                       touch_selection_controller_ != NULL;
       selection_gesture_in_process_ = false;
       EndTouchEditing(true);
       break;
     case ui::ET_GESTURE_SCROLL_END:
-      ScrollEnded();
+      scroll_in_progress_ = false;
+      StartTouchEditingIfNecessary();
       break;
     default:
       break;
   }
   return false;
 }
 
 void TouchEditableImplAura::GestureEventAck(int gesture_event_type) {
   DCHECK(rwhva_);
   if (gesture_event_type == blink::WebInputEvent::GestureTap &&
       text_input_type_ != ui::TEXT_INPUT_TYPE_NONE &&
       textfield_was_focused_on_tap_) {
     StartTouchEditing();
     UpdateEditingController();
   }
 }
 
 void TouchEditableImplAura::DidStopFlinging() {
-  ScrollEnded();
+  scroll_in_progress_ = false;
+  StartTouchEditingIfNecessary();
 }
 
 void TouchEditableImplAura::OnViewDestroyed() {
   Cleanup();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TouchEditableImplAura, ui::TouchEditable implementation:
 
 void TouchEditableImplAura::SelectRect(const gfx::Point& start,
@@ skipping 136 matching lines @@
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TouchEditableImplAura, private:
 
 TouchEditableImplAura::TouchEditableImplAura()
     : text_input_type_(ui::TEXT_INPUT_TYPE_NONE),
       rwhva_(NULL),
       selection_gesture_in_process_(false),
       handles_hidden_due_to_scroll_(false),
-      scrolls_in_progress_(0),
+      scroll_in_progress_(false),
+      overscroll_in_progress_(false),
       textfield_was_focused_on_tap_(false) {
 }
 
-void TouchEditableImplAura::ScrollEnded() {
-  scrolls_in_progress_--;
+void TouchEditableImplAura::StartTouchEditingIfNecessary() {
   // 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_ &&
+  if (!scroll_in_progress_ && !overscroll_in_progress_ &&
+      handles_hidden_due_to_scroll_ &&
       (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;
+  scroll_in_progress_ = false;
+  overscroll_in_progress_ = false;
 }
 
 }  // namespace content