Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Tap highlight fix + small perf increase"

Browse Source
This commit is contained in:
John Reck
2011-08-29 12:55:50 -07:00
committed by Android (Google) Code Review
parent 890be6b919 0ba72ad45b
commit 082a9fa343
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
core/java/android/webkit/WebView.java
View File

@@ -4004,9 +4004,12 @@ public class WebView extends AbsoluteLayout
// state. // state.
// If mNativeClass is 0, we should not reach here, so we do not // If mNativeClass is 0, we should not reach here, so we do not
// need to check it again. // need to check it again.
nativeRecordButtons(hasFocus() && hasWindowFocus(), if (mDrawCursorRing && drawRings) {
mTouchMode == TOUCH_SHORTPRESS_START_MODE // Only update if we are actually going to use the result
|| mTrackballDown || mGotCenterDown, false); nativeRecordButtons(hasFocus() && hasWindowFocus(),
mTouchMode == TOUCH_SHORTPRESS_START_MODE
|| mTrackballDown || mGotCenterDown, false);
}
drawCoreAndCursorRing(canvas, mBackgroundColor, drawCoreAndCursorRing(canvas, mBackgroundColor,
mDrawCursorRing && drawRings); mDrawCursorRing && drawRings);
} }
@@ -4075,7 +4078,8 @@ public class WebView extends AbsoluteLayout
boolean drawJavaRings = !mTouchHighlightRegion.isEmpty() boolean drawJavaRings = !mTouchHighlightRegion.isEmpty()
&& (mTouchMode == TOUCH_INIT_MODE && (mTouchMode == TOUCH_INIT_MODE
|| mTouchMode == TOUCH_SHORTPRESS_START_MODE || mTouchMode == TOUCH_SHORTPRESS_START_MODE
|| mTouchMode == TOUCH_SHORTPRESS_MODE); || mTouchMode == TOUCH_SHORTPRESS_MODE
|| mTouchMode == TOUCH_DONE_MODE);
boolean drawNativeRings = !drawJavaRings; boolean drawNativeRings = !drawJavaRings;
if (USE_WEBKIT_RINGS) { if (USE_WEBKIT_RINGS) {
drawNativeRings = !drawJavaRings && !isInTouchMode(); drawNativeRings = !drawJavaRings && !isInTouchMode();