diff options
| author | jdduke <jdduke@chromium.org> | 2015-04-02 09:41:12 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-04-02 16:41:43 +0000 |
| commit | f795840aee796fabc7267f9d33f159f5ace79cca (patch) | |
| tree | edc230d3cca851872ba8986cd3c570079727c1ef /content/public/android/java | |
| parent | aa3d14cfd8015c796f623feb716d075398735c1e (diff) | |
| download | chromium_src-f795840aee796fabc7267f9d33f159f5ace79cca.zip chromium_src-f795840aee796fabc7267f9d33f159f5ace79cca.tar.gz chromium_src-f795840aee796fabc7267f9d33f159f5ace79cca.tar.bz2 | |
[Android] Disable fling cancel filtering in the GestureEventQueue
WebView has externally-managed flings that are invisible to the
GestureEventQueue. This led to cases where we were dropping
GestureFlingCancel events while a WebView-managed fling was still
active.
For now, disable GestureEventQueue filtering of GFC events on Android,
instead using the "scroll in progress" bits from ContentViewCore to
filter the events. When WebView's fling architecture is unified with
that of the rest of Chrome, we can remove this exception.
BUG=321141
Review URL: https://codereview.chromium.org/1053823002
Cr-Commit-Position: refs/heads/master@{#323510}
Diffstat (limited to 'content/public/android/java')
| -rw-r--r-- | content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java | 4 |
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 |