Fix touch editing handles not shown after trying overscroll

content/browser/web_contents/touch_editable_impl_aura.h

Index: content/browser/web_contents/touch_editable_impl_aura.h
diff --git a/content/browser/web_contents/touch_editable_impl_aura.h b/content/browser/web_contents/touch_editable_impl_aura.h
index f63d98f7b665d4c325ff8a5d3a16bc95eb4c71c5..c4577582a3d6bf6976bacca381ae258ccc7db25f 100644
--- a/content/browser/web_contents/touch_editable_impl_aura.h
+++ b/content/browser/web_contents/touch_editable_impl_aura.h
@@ -78,7 +78,7 @@ class CONTENT_EXPORT TouchEditableImplAura
 
   // A convenience function that is called after scroll/fling/overscroll ends to
   // re-activate touch selection if necessary.
-  void ScrollEnded();
+  void StartTouchEditingIfNecessary();
 
   void Cleanup();
 
@@ -100,8 +100,9 @@ class CONTENT_EXPORT TouchEditableImplAura
   // 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.