From bcfb8f639e516b673b6dbda41900efac69be2daf Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Thu, 23 Feb 2017 14:19:35 +0000 Subject: Revert "Revert "Revert[2] "hide deprecated underline and strikethru""" This reverts commit cfd3d9ff8f370e3a4a53e2aba84dc4d682501f4c. Reason for revert: derek is fixing caller Original change's description: > 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 > > Reviewed-by: Mike Reed > > > > 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 > Commit-Queue: Mike Reed > TBR=reviews@skia.org,reed@google.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true BUG=skia:6250 Change-Id: Ie518b64219a0262cd343644754940774bf42faec Reviewed-on: https://skia-review.googlesource.com/8901 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- fuzz/FilterFuzz.cpp | 2 -- fuzz/FuzzDrawFunctions.cpp | 4 ---- 2 files changed, 6 deletions(-) (limited to 'fuzz') diff --git a/fuzz/FilterFuzz.cpp b/fuzz/FilterFuzz.cpp index e3d30b5af7..bd9e5fde8f 100644 --- a/fuzz/FilterFuzz.cpp +++ b/fuzz/FilterFuzz.cpp @@ -525,8 +525,6 @@ static SkPaint make_paint() { paint.setEmbeddedBitmapText(make_bool()); paint.setAutohinted(make_bool()); paint.setVerticalText(make_bool()); - paint.setUnderlineText(make_bool()); - paint.setStrikeThruText(make_bool()); paint.setFakeBoldText(make_bool()); paint.setDevKernText(make_bool()); paint.setFilterQuality(make_filter_quality()); diff --git a/fuzz/FuzzDrawFunctions.cpp b/fuzz/FuzzDrawFunctions.cpp index 2cd3828a51..e9e4f8e041 100644 --- a/fuzz/FuzzDrawFunctions.cpp +++ b/fuzz/FuzzDrawFunctions.cpp @@ -141,8 +141,6 @@ static void fuzz_drawText(Fuzz* fuzz, sk_sp font) { fuzz->next(&b); p.setLinearText(b); fuzz->next(&b); - p.setStrikeThruText(b); - fuzz->next(&b); p.setSubpixelText(b); fuzz->next(&x); p.setTextScaleX(x); @@ -151,8 +149,6 @@ static void fuzz_drawText(Fuzz* fuzz, sk_sp font) { fuzz->next(&x); p.setTextSize(x); fuzz->next(&b); - p.setUnderlineText(b); - fuzz->next(&b); p.setVerticalText(b); SkCanvas* cnv = surface->getCanvas(); -- cgit v1.2.3