summaryrefslogtreecommitdiffstats
path: root/content/public/android/java
diff options
context:
space:
mode:
authorjdduke <jdduke@chromium.org>2015-05-01 15:10:30 -0700
committerCommit bot <commit-bot@chromium.org>2015-05-01 22:11:52 +0000
commita4bcf3d1bd4294fb08d70974a156523720d926d0 (patch)
treec41fd2ecd7c10904df5526ae33dd1b7221da798f /content/public/android/java
parent991ec975f29b57a54d852968d255cb4125f5c4e9 (diff)
downloadchromium_src-a4bcf3d1bd4294fb08d70974a156523720d926d0.zip
chromium_src-a4bcf3d1bd4294fb08d70974a156523720d926d0.tar.gz
chromium_src-a4bcf3d1bd4294fb08d70974a156523720d926d0.tar.bz2
Restore simple fling status bookkeeping
Recently, an active fling counter was introduced to track whether a fling was active in the renderer. This was useful both for filtering fling cancel events as well as signalling the end of a fling gesture for telemetry purposes. However, there appear to be gaps in the fling accounting that don't appear in telemetry but do appear in the wild, causing issues with fling-related tap suppression logic. Restore the previous fling bookkeeping for the GestureEventQueue until the in-flight fling count is correct for all gesture types. BUG=483037 Review URL: https://codereview.chromium.org/1113143002 Cr-Commit-Position: refs/heads/master@{#327993}
Diffstat (limited to 'content/public/android/java')
-rw-r--r--content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java4
1 files changed, 0 insertions, 4 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 af50532..2dd69ba 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
@@ -1200,10 +1200,6 @@ 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