commit e668b03ac7186e3972fba4f7f018de5b4492cafc
author John Reck <jreck@google.com> Thu Sep 15 13:51:52 2011 -0700
committer John Reck <jreck@google.com> Fri Sep 16 11:50:11 2011 -0700
tree 1efa54848436eb959f9ad64c703143d8ba5a15f1
parent cb995121ee4bb4da236e8181fbfbd33bc2f9173a

DO NOT MERGE Fix text selection drawing on SW

 Bug: 5312770
 Helps if you actually draw stuff...
 Cherry pick from master

Change-Id: Iae4e7fbd2dc6a5306e8ca8735580e1f2eb50f276

core/java/android/webkit/WebView.java

diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java
index be42608..2795bb4 100644
--- a/core/java/android/webkit/WebView.java
+++ b/core/java/android/webkit/WebView.java
@@ -4441,6 +4441,7 @@
                 mHeldMotionless = MOTIONLESS_PENDING;
             }
         }
+        int saveCount = canvas.save();
         if (animateZoom) {
             mZoomManager.animateZoom(canvas);
         } else if (!canvas.isHardwareAccelerated()) {
@@ -4491,10 +4492,6 @@
                 nativeUseHardwareAccelSkia(mHardwareAccelSkia);
             }
 
-            if (mSelectingText && USE_JAVA_TEXT_SELECTION) {
-                drawTextSelectionHandles(canvas);
-            }
-
         } else {
             DrawFilter df = null;
             if (mZoomManager.isZoomAnimating() || UIAnimationsRunning) {
@@ -4512,6 +4509,11 @@
             }
         }
 
+        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;