Merge "Make LTE_FLOAT a strict weak order. (DO NOT MERGE) Bug: 5327776" into ics-factoryrom
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;