summaryrefslogtreecommitdiffstats
path: root/content/public/android/java
diff options
context:
space:
mode:
Diffstat (limited to 'content/public/android/java')
-rw-r--r--content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
index 4ff6459..d69c659 100644
--- a/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
+++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java
@@ -1231,6 +1231,10 @@ public class ContentViewCore
|| eventAction == MotionEvent.ACTION_POINTER_UP;
}
+ /**
+ * @return Whether there are any active, content-targeted scroll or fling gestures.
+ */
+ @CalledByNative
public boolean isScrollInProgress() {
return mTouchScrollInProgress
|| mPotentiallyActiveFlingCount > 0