DO NOT MERGE Fix text selection drawing on SW

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

Change-Id: Iae4e7fbd2dc6a5306e8ca8735580e1f2eb50f276

Author: jreck

core/java/android/webkit/WebView.java

@@ -4441,6 +4441,7 @@ private void drawCoreAndCursorRing(Canvas canvas, int color,
                 mHeldMotionless = MOTIONLESS_PENDING;
             }
         }
+        int saveCount = canvas.save();
         if (animateZoom) {
             mZoomManager.animateZoom(canvas);
         } else if (!canvas.isHardwareAccelerated()) {
@@ -4491,10 +4492,6 @@ private void drawCoreAndCursorRing(Canvas canvas, int color,
                 nativeUseHardwareAccelSkia(mHardwareAccelSkia);
             }
 
-            if (mSelectingText && USE_JAVA_TEXT_SELECTION) {
-                drawTextSelectionHandles(canvas);
-            }
-
         } else {
             DrawFilter df = null;
             if (mZoomManager.isZoomAnimating() || UIAnimationsRunning) {
@@ -4512,6 +4509,11 @@ private void drawCoreAndCursorRing(Canvas canvas, int color,
             }
         }
 
+        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;