commit a82f448373ca0f0e67fb52a2bdc489c4ed0b17ac
author Jeff Brown <jeffbrown@google.com> Fri Sep 16 13:42:46 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 16 13:42:46 2011 -0700
tree 3eef28ff3099e894841d506c09d116ed52ad89d4
parent 41d6bfb27909c2f27e41b5aa1d182e00b4c2f631
parent 3fccb86b31b4065d6ebd2e0268bee710123f0a24

Merge "Make LTE_FLOAT a strict weak order. (DO NOT MERGE) Bug: 5327776" into ics-factoryrom

core/java/android/webkit/WebView.java

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 @@
                 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;