Android: Consolidate scroll status update in GestureListenerManager

The API |isScrollInProgress| is defined in ContentViewCore while
scroll-related state handling is spread across GestureListenerManager
and SelectionPopupController.

This CL tidies it up by moving the API to GestureListenerManager,
and making it the main class that takes care of all the scroll stuff.

Bug: 598880
Change-Id: Ib5abdddd361b93b823465b978aabfe9903d7cf68
Reviewed-on: https://chromium-review.googlesource.com/965863Reviewed-by: Tommy Nyquist <nyquist@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#544872}

chrome/android/java/src/org/chromium/chrome/browser/tab/Tab.java

@@ -447,8 +447,13 @@ public class Tab
             private void onScrollingStateChanged() {
                 FullscreenManager fullscreenManager = getFullscreenManager();
                 if (fullscreenManager == null) return;
-                fullscreenManager.onContentViewScrollingStateChanged(
-                        getContentViewCore() != null && getContentViewCore().isScrollInProgress());
+                fullscreenManager.onContentViewScrollingStateChanged(isScrollInProgress());
+            }
+
+            private boolean isScrollInProgress() {
+                WebContents webContents = getWebContents();
+                if (webContents == null) return false;
+                return GestureListenerManager.fromWebContents(webContents).isScrollInProgress();
             }
         };
     }

content/public/android/java/src/org/chromium/content/browser/ContentViewCoreImpl.java

@@ -92,7 +92,7 @@ public class ContentViewCoreImpl implements ContentViewCore, DisplayAndroidObser
             ContentViewCoreImpl contentViewCore = mWeakContentViewCore.get();
             if (contentViewCore == null) return;
             contentViewCore.hidePopupsAndClearSelection();
-            contentViewCore.resetScrollInProgress();
+            contentViewCore.getGestureListenerManager().resetScrollInProgress();
         }
     }
 
@@ -103,19 +103,19 @@ public class ContentViewCoreImpl implements ContentViewCore, DisplayAndroidObser
     private class ContentGestureStateListener implements GestureStateListener {
         @Override
         public void onFlingStartGesture(int scrollOffsetY, int scrollExtentY) {
-            setTouchScrollInProgress(false);
+            getGestureListenerManager().setTouchScrollInProgress(false);
         }
 
         @Override
         public void onFlingEndGesture(int scrollOffsetY, int scrollExtentY) {
             // Note that mTouchScrollInProgress should normally be false at this
             // point, but we reset it anyway as another failsafe.
-            setTouchScrollInProgress(false);
+            getGestureListenerManager().setTouchScrollInProgress(false);
         }
 
         @Override
         public void onScrollStarted(int scrollOffsetY, int scrollExtentY) {
-            setTouchScrollInProgress(true);
+            getGestureListenerManager().setTouchScrollInProgress(false);
         }
 
         @Override
@@ -125,7 +125,7 @@ public class ContentViewCoreImpl implements ContentViewCore, DisplayAndroidObser
 
         @Override
         public void onScrollEnded(int scrollOffsetY, int scrollExtentY) {
-            setTouchScrollInProgress(false);
+            getGestureListenerManager().setTouchScrollInProgress(false);
         }
 
         @Override
@@ -434,18 +434,6 @@ public class ContentViewCoreImpl implements ContentViewCore, DisplayAndroidObser
         return nativeGetTopControlsShrinkBlinkHeightPixForTesting(mNativeContentViewCore);
     }
 
-    @Override
-    public boolean isScrollInProgress() {
-        return getSelectionPopupController().getScrollInProgress()
-                || getGestureListenerManager().hasPotentiallyActiveFling();
-    }
-
-    private void setTouchScrollInProgress(boolean touchScrollInProgress) {
-        final boolean scrollInProgress =
-                touchScrollInProgress || getGestureListenerManager().hasPotentiallyActiveFling();
-        getSelectionPopupController().setScrollInProgress(touchScrollInProgress, scrollInProgress);
-    }
-
     @Override
     public void onShow() {
         assert mWebContents != null;
@@ -779,20 +767,6 @@ public class ContentViewCoreImpl implements ContentViewCore, DisplayAndroidObser
                 settings.getTextTrackTextSize());
     }
 
-    /**
-     * Reset scroll and fling accounting, notifying listeners as appropriate.
-     * This is useful as a failsafe when the input stream may have been interruped.
-     */
-    private void resetScrollInProgress() {
-        if (!isScrollInProgress()) return;
-
-        final boolean touchScrollInProgress = getSelectionPopupController().getScrollInProgress();
-
-        setTouchScrollInProgress(false);
-        if (touchScrollInProgress) getGestureListenerManager().updateOnScrollEnd();
-        getGestureListenerManager().resetFlingGesture();
-    }
-
     // DisplayAndroidObserver method.
     @Override
     public void onRotationChanged(int rotation) {

content/public/android/java/src/org/chromium/content/browser/GestureListenerManagerImpl.java

@@ -11,6 +11,7 @@ import org.chromium.base.ObserverList.RewindableIterator;
 import org.chromium.base.TraceEvent;
 import org.chromium.base.annotations.CalledByNative;
 import org.chromium.base.annotations.JNINamespace;
+import org.chromium.content.browser.selection.SelectionPopupControllerImpl;
 import org.chromium.content.browser.webcontents.WebContentsImpl;
 import org.chromium.content.browser.webcontents.WebContentsUserData;
 import org.chromium.content.browser.webcontents.WebContentsUserData.UserDataFactory;
@@ -46,6 +47,13 @@ public class GestureListenerManagerImpl implements GestureListenerManager, Windo
 
     private long mNativeGestureListenerManager;
 
+    /**
+     * Whether a touch scroll sequence is active, used to hide text selection
+     * handles. Note that a scroll sequence will *always* bound a pinch
+     * sequence, so this will also be true for the duration of a pinch gesture.
+     */
+    private boolean mIsTouchScrollInProgress;
+
     /**
      * @param webContents {@link WebContents} object.
      * @return {@link GestureListenerManager} object used for the give WebContents.
@@ -268,6 +276,36 @@ public class GestureListenerManagerImpl implements GestureListenerManager, Windo
         TraceEvent.end("GestureListenerManagerImpl:updateScrollInfo");
     }
 
+    @Override
+    public boolean isScrollInProgress() {
+        return mIsTouchScrollInProgress || hasPotentiallyActiveFling();
+    }
+
+    void setTouchScrollInProgress(boolean touchScrollInProgress) {
+        mIsTouchScrollInProgress = touchScrollInProgress;
+
+        // Use the active touch scroll signal for hiding. The animation movement
+        // by fling will naturally hide the ActionMode by invalidating its content rect.
+        getSelectionPopupController().setScrollInProgress(touchScrollInProgress);
+    }
+
+    /**
+     * Reset scroll and fling accounting, notifying listeners as appropriate.
+     * This is useful as a failsafe when the input stream may have been interruped.
+     */
+    void resetScrollInProgress() {
+        if (!isScrollInProgress()) return;
+
+        final boolean touchScrollInProgress = mIsTouchScrollInProgress;
+        setTouchScrollInProgress(false);
+        if (touchScrollInProgress) updateOnScrollEnd();
+        resetFlingGesture();
+    }
+
+    private SelectionPopupControllerImpl getSelectionPopupController() {
+        return SelectionPopupControllerImpl.fromWebContents(mWebContents);
+    }
+
     /**
      * Offer a long press gesture to the embedding View, primarily for WebView compatibility.
      *

content/public/android/java/src/org/chromium/content/browser/selection/SelectionPopupControllerImpl.java

@@ -41,6 +41,7 @@ import org.chromium.base.annotations.JNINamespace;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.content.R;
 import org.chromium.content.browser.ContentClassFactory;
+import org.chromium.content.browser.GestureListenerManagerImpl;
 import org.chromium.content.browser.PopupController;
 import org.chromium.content.browser.PopupController.HideablePopup;
 import org.chromium.content.browser.WindowAndroidChangedObserver;
@@ -162,9 +163,6 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
     // SelectionClient was able to classify it, otherwise null.
     private SelectionClient.Result mClassificationResult;
 
-    // Whether a scroll is in progress.
-    private boolean mScrollInProgress;
-
     private boolean mPreserveSelectionOnNextLossOfFocus;
 
     private boolean mInitialized;
@@ -604,22 +602,12 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
         updateTextSelectionUI(false);
     }
 
-    public void setScrollInProgress(boolean touchScrollInProgress, boolean scrollInProgress) {
-        mScrollInProgress = scrollInProgress;
-
-        // The active fling count reflected in |scrollInProgress| isn't reliable with WebView,
-        // so only use the active touch scroll signal for hiding. The fling animation
-        // movement will naturally hide the ActionMode by invalidating its content rect.
-        hideActionMode(touchScrollInProgress);
-    }
-
     /**
-     * Whether a touch scroll sequence is active, used to hide text selection
-     * handles. Note that a scroll sequence will *always* bound a pinch
-     * sequence, so this will also be true for the duration of a pinch gesture.
+     * Update scroll status.
+     * @param scrollInProgress {@code true} if scroll is in progress.
      */
-    public boolean getScrollInProgress() {
-        return mScrollInProgress;
+    public void setScrollInProgress(boolean scrollInProgress) {
+        hideActionMode(scrollInProgress);
     }
 
     /**
@@ -1256,7 +1244,7 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
 
             case SelectionEventType.INSERTION_HANDLE_MOVED:
                 mSelectionRect.set(left, top, right, bottom);
-                if (!mScrollInProgress && isPastePopupShowing()) {
+                if (!getGestureListenerManager().isScrollInProgress() && isPastePopupShowing()) {
                     showPastePopup();
                 } else {
                     destroyPastePopup();
@@ -1307,6 +1295,10 @@ public class SelectionPopupControllerImpl extends ActionModeCallbackHelper
         }
     }
 
+    private GestureListenerManagerImpl getGestureListenerManager() {
+        return GestureListenerManagerImpl.fromWebContents(mWebContents);
+    }
+
     @VisibleForTesting
     @CalledByNative
     /* package */ void onDragUpdate(float x, float y) {

content/public/android/java/src/org/chromium/content_public/browser/ContentViewCore.java

@@ -154,11 +154,6 @@ public interface ContentViewCore {
      */
     boolean isAlive();
 
-    /**
-     * @return Whether a scroll targeting web content is in progress.
-     */
-    boolean isScrollInProgress();
-
     /**
      * To be called when the ContentView is shown.
      */

content/public/android/java/src/org/chromium/content_public/browser/GestureListenerManager.java

@@ -31,4 +31,9 @@ public interface GestureListenerManager {
      * @param listener Listener to remove.
      */
     void removeListener(GestureStateListener listener);
+
+    /**
+     * @return Whether a scroll targeting web content is in progress.
+     */
+    boolean isScrollInProgress();
 }

content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestContentViewCore.java

@@ -54,11 +54,6 @@ public class TestContentViewCore implements ContentViewCore {
         return false;
     }
 
-    @Override
-    public boolean isScrollInProgress() {
-        return false;
-    }
-
     @Override
     public void onShow() {}