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

Merge "Partial rollback of I9ebc92dc"

Browse Source
This commit is contained in:
John Reck
2011-09-01 13:46:03 -07:00
committed by Android (Google) Code Review
parent 40f2faadc1 39bb698cd2
commit 0aadeca6cc
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4007,12 +4007,9 @@ 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.
if (mDrawCursorRing && drawRings) { nativeRecordButtons(hasFocus() && hasWindowFocus(),
// Only update if we are actually going to use the result (mTouchMode == TOUCH_SHORTPRESS_START_MODE && !USE_WEBKIT_RINGS)
nativeRecordButtons(hasFocus() && hasWindowFocus(), || mTrackballDown || mGotCenterDown, false);
mTouchMode == TOUCH_SHORTPRESS_START_MODE
|| mTrackballDown || mGotCenterDown, false);
}
drawCoreAndCursorRing(canvas, mBackgroundColor, drawCoreAndCursorRing(canvas, mBackgroundColor,
mDrawCursorRing && drawRings); mDrawCursorRing && drawRings);
} }