diff options
| author | John Reck <jreck@google.com> | 2011-09-16 13:21:31 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-16 13:21:31 -0700 |
| commit | 41d6bfb27909c2f27e41b5aa1d182e00b4c2f631 (patch) | |
| tree | bccba08d5c5b7c8f7dd92917af24adedb0e7f9cf | |
| parent | 3d5759b527fd0e48cfcc759dfed68fbe5a4dd050 (diff) | |
| parent | e668b03ac7186e3972fba4f7f018de5b4492cafc (diff) | |
| download | frameworks_base-41d6bfb27909c2f27e41b5aa1d182e00b4c2f631.zip frameworks_base-41d6bfb27909c2f27e41b5aa1d182e00b4c2f631.tar.gz frameworks_base-41d6bfb27909c2f27e41b5aa1d182e00b4c2f631.tar.bz2 | |
Merge "DO NOT MERGE Fix text selection drawing on SW" into ics-factoryrom
| -rw-r--r-- | core/java/android/webkit/WebView.java | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index fae2c6f..600c899 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -4441,6 +4441,7 @@ public class WebView extends AbsoluteLayout mHeldMotionless = MOTIONLESS_PENDING; } } + int saveCount = canvas.save(); if (animateZoom) { mZoomManager.animateZoom(canvas); } else if (!canvas.isHardwareAccelerated()) { @@ -4491,10 +4492,6 @@ public class WebView extends AbsoluteLayout nativeUseHardwareAccelSkia(mHardwareAccelSkia); } - if (mSelectingText && USE_JAVA_TEXT_SELECTION) { - drawTextSelectionHandles(canvas); - } - } else { DrawFilter df = null; if (mZoomManager.isZoomAnimating() || UIAnimationsRunning) { @@ -4512,6 +4509,11 @@ public class WebView extends AbsoluteLayout } } + canvas.restoreToCount(saveCount); + if (mSelectingText && USE_JAVA_TEXT_SELECTION) { + drawTextSelectionHandles(canvas); + } + if (extras == DRAW_EXTRAS_CURSOR_RING) { if (mTouchMode == TOUCH_SHORTPRESS_START_MODE) { mTouchMode = TOUCH_SHORTPRESS_MODE; |