aboutsummaryrefslogtreecommitdiffhomepage
path: root/fuzz
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2017-02-23 14:06:12 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-02-23 14:06:19 +0000
commitcfd3d9ff8f370e3a4a53e2aba84dc4d682501f4c (patch)
tree8f896e6e8b99f6c6af930017d6264cb8522553fa /fuzz
parentb16e8ac7f37b30ca9a51367e49c5815f36774120 (diff)
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>
Diffstat (limited to 'fuzz')
-rw-r--r--fuzz/FilterFuzz.cpp2
-rw-r--r--fuzz/FuzzDrawFunctions.cpp4
2 files changed, 6 insertions, 0 deletions
diff --git a/fuzz/FilterFuzz.cpp b/fuzz/FilterFuzz.cpp
index bd9e5fde8f..e3d30b5af7 100644
--- a/fuzz/FilterFuzz.cpp
+++ b/fuzz/FilterFuzz.cpp
@@ -525,6 +525,8 @@ 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 e9e4f8e041..2cd3828a51 100644
--- a/fuzz/FuzzDrawFunctions.cpp
+++ b/fuzz/FuzzDrawFunctions.cpp
@@ -141,6 +141,8 @@ static void fuzz_drawText(Fuzz* fuzz, sk_sp<SkTypeface> 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);
@@ -149,6 +151,8 @@ static void fuzz_drawText(Fuzz* fuzz, sk_sp<SkTypeface> font) {
fuzz->next(&x);
p.setTextSize(x);
fuzz->next(&b);
+ p.setUnderlineText(b);
+ fuzz->next(&b);
p.setVerticalText(b);
SkCanvas* cnv = surface->getCanvas();