diff options
| author | John Reck <jreck@google.com> | 2011-09-16 10:39:16 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-16 10:39:16 -0700 |
| commit | 5dd1916c247f27284e4af8be5125633fddae6452 (patch) | |
| tree | 2072e428c9769f935245021a509bb4afd64bab7c /core/java/android | |
| parent | 5908eaef126c746aa88448b53cdc69623dee4fb4 (diff) | |
| parent | 57efcffc7f7290a5510bd1f4f1880a32cc37ad6d (diff) | |
| download | frameworks_base-5dd1916c247f27284e4af8be5125633fddae6452.zip frameworks_base-5dd1916c247f27284e4af8be5125633fddae6452.tar.gz frameworks_base-5dd1916c247f27284e4af8be5125633fddae6452.tar.bz2 | |
Merge "Fix text selection drawing on SW"
Diffstat (limited to 'core/java/android')
| -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; |