diff options
| author | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-12 16:43:43 +0000 |
|---|---|---|
| committer | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-12 16:43:43 +0000 |
| commit | 6deb41dca8a92a5d3658e73ee8b1273564a84a5c (patch) | |
| tree | 10c186e1c7456b5e0e0f3f8943449b84a072d845 | |
| parent | d473faf1197b5ef4682cab1747e162dd2e6f4a82 (diff) | |
| download | chromium_src-6deb41dca8a92a5d3658e73ee8b1273564a84a5c.zip chromium_src-6deb41dca8a92a5d3658e73ee8b1273564a84a5c.tar.gz chromium_src-6deb41dca8a92a5d3658e73ee8b1273564a84a5c.tar.bz2 | |
Merge 216231 "Skip touch handler timeout if touchstart/touchmove..."
> Skip touch handler timeout if touchstart/touchmove has been prevent default
>
> The short-term change about touch handler timeout for bug 244740 breaks
> some websites. Before we remove the timeout, improve by skipping the
> timeout if touchstart or touchmove has been prevent default.
>
> BUG=269024
>
> Review URL: https://chromiumcodereview.appspot.com/22445004
TBR=wangxianzhu@chromium.org
Review URL: https://codereview.chromium.org/22807006
git-svn-id: svn://svn.chromium.org/chrome/branches/1547/src@217015 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java b/content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java index e019551..3f0fe05 100644 --- a/content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java +++ b/content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java @@ -800,7 +800,8 @@ class ContentViewGestureHandler implements LongPressDelegate { mTouchCancelEventSent = false; if (mMotionEventDelegate.sendTouchEvent(event.getEventTime(), type, pts)) { - if (event.getAction() != MotionEvent.ACTION_UP + if (!mJavaScriptIsConsumingGesture + && event.getAction() != MotionEvent.ACTION_UP && event.getAction() != MotionEvent.ACTION_CANCEL) { mTouchEventTimeoutHandler.start(event.getEventTime(), pts); } |