content/public/android/java/src/org/chromium/content/browser/ContentViewGestureHandler.java - Issue 11299083: Fixes for nonmodal pinch zoom.

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/ContentViewGestureHandler.java

Issue 11299083: Fixes for nonmodal pinch zoom. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Whitelist findbugs and fix cc_unittests Created 8 years, 1 month 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 | « cc/layer_tree_host_impl_unittest.cc ('k') | content/public/android/java/src/org/chromium/content/browser/third_party/GestureDetector.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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 f2ce4563d87f055b59a65d46248c87b43dc417ca..699fa0181fa378db4f71062912f4a357f390aa45 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

@@ -8,11 +8,11 @@ import android.content.Context;

import android.os.Bundle;

import android.util.Log;

import android.util.Pair;

-import android.view.GestureDetector;

-import android.view.GestureDetector.OnGestureListener;

import android.view.MotionEvent;

import android.view.ViewConfiguration;

+import org.chromium.content.browser.third_party.GestureDetector;

+import org.chromium.content.browser.third_party.GestureDetector.OnGestureListener;

import org.chromium.content.browser.LongPressDetector.LongPressDelegate;

import org.chromium.content.common.TraceEvent;

@@ -697,8 +697,7 @@ class ContentViewGestureHandler implements LongPressDelegate {

// "Last finger raised" could be an end to movement. However,

// give the mSimpleTouchDetector a chance to continue

// scrolling with a fling.

- if ((event.getAction() == MotionEvent.ACTION_UP) &&

- (event.getPointerCount() == 1)) {

+ if (event.getAction() == MotionEvent.ACTION_UP) {

if (mNativeScrolling) {

possiblyEndMovement = true;

}