content/public/android/java/src/org/chromium/content/browser/ZoomManager.java - Issue 27220002: [Android] Properly handle cancelled scroll events

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/public/android/java/src/org/chromium/content/browser/ZoomManager.java

Issue 27220002: [Android] Properly handle cancelled scroll events (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 2 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java ('k') | content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java » ('j') | content/public/android/javatests/src/org/chromium/content/browser/ContentViewGestureHandlerTest.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/public/android/java/src/org/chromium/content/browser/ZoomManager.java

diff --git a/content/public/android/java/src/org/chromium/content/browser/ZoomManager.java b/content/public/android/java/src/org/chromium/content/browser/ZoomManager.java

index 986d61ebc00cd14d957f86d58e210c401ae37ccb..e5fdcce643debe5a93ee6114f8dd709da8803fc9 100644

--- a/content/public/android/java/src/org/chromium/content/browser/ZoomManager.java

+++ b/content/public/android/java/src/org/chromium/content/browser/ZoomManager.java

@@ -123,7 +123,8 @@ class ZoomManager {

try {

boolean inGesture = isScaleGestureDetectionInProgress();

boolean retVal = mMultiTouchDetector.onTouchEvent(event);

- if (event.getActionMasked() == MotionEvent.ACTION_UP && !inGesture) return false;

+ if (!inGesture && (event.getActionMasked() == MotionEvent.ACTION_UP

+ || event.getActionMasked() == MotionEvent.ACTION_CANCEL)) return false;

Ted C 2013/10/14 20:05:38 braces needed since the conditional no longer fits

cjhopman 2013/10/14 20:37:09 Done.

return retVal;

} catch (Exception e) {

Log.e(TAG, "ScaleGestureDetector got into a bad state!", e);