content/public/android/java/src/org/chromium/content/browser/ContentViewCore.java - Issue 628763003: Support InputRouter recycling

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

Issue 628763003: Support InputRouter recycling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Updates Created 6 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

« content/common/input/input_event_stream_validator.cc ('K') | « content/common/input/input_event_stream_validator.cc ('k') | content/public/test/test_renderer_host.h » ('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/ContentViewCore.java

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 65a6737db55bdb60af51d40d78d4765290907119..6875a6aeb02da194efd7ddf463d77cea027d384a 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

@@ -634,7 +634,6 @@ public class ContentViewCore

boolean isNavigationToDifferentPage, boolean isFragmentNavigation) {

if (!isNavigationToDifferentPage) return;

hidePopupsAndClearSelection();

- resetScrollInProgress();

resetGestureDetection();

}

@@ -1268,8 +1267,8 @@ public class ContentViewCore

}

private void resetGestureDetection() {

jdduke (slow) 2014/12/20 01:12:17 Should probably rename this to |resetInputStream()

- if (mNativeContentViewCore == 0) return;

- nativeResetGestureDetection(mNativeContentViewCore);

+ if (mNativeContentViewCore != 0) nativeResetGestureDetection(mNativeContentViewCore);

+ resetScrollInProgress();

}

/**