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

am 0aadeca6: Merge "Partial rollback of I9ebc92dc"

Browse Source 
* commit '0aadeca6cc05367faae1eacda6be580df41c17ee':
  Partial rollback of I9ebc92dc
This commit is contained in:
John Reck
2011-09-01 13:47:33 -07:00
committed by Android Git Automerger
parent 6ff35c2b16 0aadeca6cc
commit d99ecbd98f
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.
// If mNativeClass is 0, we should not reach here, so we do not
// need to check it again.
if (mDrawCursorRing && drawRings) {
// Only update if we are actually going to use the result
nativeRecordButtons(hasFocus() && hasWindowFocus(),
mTouchMode == TOUCH_SHORTPRESS_START_MODE
|| mTrackballDown || mGotCenterDown, false);
}
nativeRecordButtons(hasFocus() && hasWindowFocus(),
(mTouchMode == TOUCH_SHORTPRESS_START_MODE && !USE_WEBKIT_RINGS)
|| mTrackballDown || mGotCenterDown, false);
drawCoreAndCursorRing(canvas, mBackgroundColor,
mDrawCursorRing && drawRings);
}