Revert "Revert[2] "hide deprecated underline and strikethru""

This reverts commit aab68c56ef8fc88b0d1536f99aa1cc9ae7a0573a.

Reason for revert: android still broken RecordingCanvasTests.cpp

Original change's description:
> Revert[2] "hide deprecated underline and strikethru"
> 
> android now updated.
> 
> This reverts commit e005edd3a5deb602beec59f59cdc8b14d3764d58.
> 
> BUG=skia:6250
> 
> Change-Id: If08d344cdd863fde1d9955dc3fab671a83be0f73
> Reviewed-on: https://skia-review.googlesource.com/8815
> Commit-Queue: Mike Reed <reed@google.com>
> Reviewed-by: Mike Reed <reed@google.com>
> 

TBR=reed@google.com,reviews@skia.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:6250

Change-Id: I954575a0e4b9aca8414e10901a7be03a2d7e6396
Reviewed-on: https://skia-review.googlesource.com/8900
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>

1 files changed, 32 insertions, 0 deletions

diff --git a/gm/texteffects.cpp b/gm/texteffects.cpp
index e74d7a97f5..c4c389a065 100644
--- a/gm/texteffects.cpp
+++ b/gm/texteffects.cpp
@@ -195,6 +195,38 @@ DEF_SIMPLE_GM(texteffects, canvas, 460, 680) {
         canvas->restore();
 }
 
+DEF_SIMPLE_GM(textunderstrike, canvas, 460, 680) {
+    canvas->clear(SK_ColorYELLOW);
+    SkPaint paint;
+    sk_tool_utils::set_portable_typeface(&paint);
+    paint.setTextSize(50);
+    paint.setStrokeWidth(5);
+    paint.setAntiAlias(true);
+
+    auto drawText = [&]() {
+        paint.setStyle(SkPaint::kFill_Style);
+        canvas->drawText("Hello", 5, 100, 50, paint);
+        paint.setStyle(SkPaint::kStroke_Style);
+        canvas->drawText("Hello", 5, 100, 100, paint);
+        canvas->translate(0, 100);
+    };
+
+    drawText();
+    paint.setUnderlineText(true);
+    drawText();
+    paint.setUnderlineText(false);
+    paint.setStrikeThruText(true);
+    drawText();
+    paint.setUnderlineText(true);
+    drawText();
+    paint.setColor(SK_ColorWHITE);
+    paint.setStyle(SkPaint::kStroke_Style);
+    canvas->drawText("Hello", 5, 100, 50, paint);
+    paint.setColor(SK_ColorBLUE);
+    paint.setStyle(SkPaint::kFill_Style);
+    canvas->drawText("Hello", 5, 100, 50, paint);
+}
+
 static SkPath create_underline(const SkTDArray<SkScalar>& intersections,
         SkScalar last, SkScalar finalPos,
         SkScalar uPos, SkScalar uWidth, SkScalar textSize) {