Fix touch editing handles not shown after trying overscroll

content/browser/web_contents/touch_editable_impl_aura.h

 // 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.
 
 #ifndef CONTENT_BROWSER_WEB_CONTENTS_TOUCH_EDITABLE_IMPL_AURA_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_TOUCH_EDITABLE_IMPL_AURA_H_
 
 #include <deque>
 #include <map>
 #include <queue>
@@ skipping 60 matching lines @@
   void DestroyTouchSelection() override;
 
  protected:
   TouchEditableImplAura();
 
  private:
   friend class TouchEditableImplAuraTest;
 
   // A convenience function that is called after scroll/fling/overscroll ends to
   // re-activate touch selection if necessary.
-  void ScrollEnded();
+  void StartTouchEditingIfNecessary();
 
   void Cleanup();
 
   // Bounds for the selection.
   ui::SelectionBound selection_anchor_;
   ui::SelectionBound selection_focus_;
 
   // The current text input type.
   ui::TextInputType text_input_type_;
 
   RenderWidgetHostViewAura* rwhva_;
   scoped_ptr<ui::TouchEditingControllerDeprecated> touch_selection_controller_;
 
   // True if |rwhva_| is currently handling a gesture that could result in a
   // change in selection (long press, double tap or triple tap).
   bool selection_gesture_in_process_;
 
   // Set to true if handles are hidden when user is scrolling. Used to determine
   // whether to re-show handles after a scrolling session.
   bool handles_hidden_due_to_scroll_;
 
-  // Keeps track of number of scrolls/flings/overscrolls in progress.
-  int scrolls_in_progress_;
+  // Keep track of scrolls/overscrolls in progress.
+  bool scroll_in_progress_;
+  bool overscroll_in_progress_;
 
   // Used to track if a textfield was focused when the current tap gesture
   // happened.
   bool textfield_was_focused_on_tap_;
 
   DISALLOW_COPY_AND_ASSIGN(TouchEditableImplAura);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_TOUCH_EDITABLE_IMPL_AURA_H_