diff options
| author | Mike Reed <reed@google.com> | 2018-11-07 17:09:15 -0500 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-11-07 22:47:53 +0000 |
| commit | f49563bf9276f70441fd22da83413d585b2bcc17 (patch) | |
| tree | 6d1291d94b68f16e8b50c851722b89864840545c /fuzz | |
| parent | 41f2b33c4f6a48e9cb1c0615556238942c97cd91 (diff) | |
| download | skqp-f49563bf9276f70441fd22da83413d585b2bcc17.tar.gz | |
Revert "Revert "hide nested hinting enum""
This reverts commit 6bd19df9fa9d26d9de4de646b2cdf82ff5dca67c.
Restores original CL, but adds guards for flutter.
Bug: skia:
Change-Id: I380b4ea87d293355026d734249aa2b8c397da144
Reviewed-on: https://skia-review.googlesource.com/c/169345
Reviewed-by: Florin Malita <fmalita@chromium.org>
Commit-Queue: Mike Reed <reed@google.com>
Auto-Submit: Mike Reed <reed@google.com>
Diffstat (limited to 'fuzz')
| -rw-r--r-- | fuzz/FuzzCanvas.cpp | 4 | ||||
| -rw-r--r-- | fuzz/FuzzDrawFunctions.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp index ae675e71ae..fe03b2fc52 100644 --- a/fuzz/FuzzCanvas.cpp +++ b/fuzz/FuzzCanvas.cpp @@ -888,8 +888,8 @@ static void fuzz_paint_text(Fuzz* fuzz, SkPaint* paint) { paint->setEmbeddedBitmapText(make_fuzz_t<bool>(fuzz)); paint->setAutohinted( make_fuzz_t<bool>(fuzz)); paint->setFakeBoldText( make_fuzz_t<bool>(fuzz)); - paint->setHinting( make_fuzz_t_range<SkPaint::Hinting>(fuzz, 0, - SkPaint::kFull_Hinting)); + paint->setHinting( make_fuzz_t_range<SkFontHinting>(fuzz, 0, + kFull_SkFontHinting)); } static void fuzz_paint_text_encoding(Fuzz* fuzz, SkPaint* paint) { diff --git a/fuzz/FuzzDrawFunctions.cpp b/fuzz/FuzzDrawFunctions.cpp index 00166a9733..56e6cdf147 100644 --- a/fuzz/FuzzDrawFunctions.cpp +++ b/fuzz/FuzzDrawFunctions.cpp @@ -48,7 +48,7 @@ static void init_paint(Fuzz* fuzz, SkPaint* p) { p->setFilterQuality(static_cast<SkFilterQuality>(tmp_u8)); fuzz->nextRange(&tmp_u8, 0, (int)SkPaint::kFull_Hinting); - p->setHinting(static_cast<SkPaint::Hinting>(tmp_u8)); + p->setHinting(static_cast<SkFontHinting>(tmp_u8)); fuzz->nextRange(&tmp_u8, 0, (int)SkPaint::kLast_Cap); p->setStrokeCap(static_cast<SkPaint::Cap>(tmp_u8)); |