diff options
| author | Herb Derby <herb@google.com> | 2019-01-22 14:45:16 -0500 |
|---|---|---|
| committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2019-01-23 18:52:09 +0000 |
| commit | 087fad7900d21ac938b7628051fcd48e2b4f538b (patch) | |
| tree | 02f22f29711c8b2f3f77538994c9040c5409c9d3 /fuzz | |
| parent | 08b0b7fd5bd5c2b6ab746246167b1f0f446c9830 (diff) | |
| download | skqp-087fad7900d21ac938b7628051fcd48e2b4f538b.tar.gz | |
Add getTypefaceOrDefault and refTypefaceOrDefault
* Remove GetTypefaceOrDefault from SkPaint and SkFont
* Remove RefTypefaceOrDefault from SkPaint and SkFont
Change-Id: I04ae777142c2bdec849508b611b844418bbaedff
Reviewed-on: https://skia-review.googlesource.com/c/185781
Reviewed-by: Mike Reed <reed@google.com>
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Herb Derby <herb@google.com>
Diffstat (limited to 'fuzz')
| -rw-r--r-- | fuzz/FuzzCanvas.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/fuzz/FuzzCanvas.cpp b/fuzz/FuzzCanvas.cpp index 21918d9f04..4cb61ce0a7 100644 --- a/fuzz/FuzzCanvas.cpp +++ b/fuzz/FuzzCanvas.cpp @@ -903,8 +903,7 @@ constexpr int kMaxGlyphCount = 30; static SkTDArray<uint8_t> make_fuzz_text(Fuzz* fuzz, const SkFont& font, SkTextEncoding encoding) { SkTDArray<uint8_t> array; if (kGlyphID_SkTextEncoding == encoding) { - int glyphRange = font.getTypeface() ? font.getTypeface()->countGlyphs() - : SkTypeface::MakeDefault()->countGlyphs(); + int glyphRange = font.getTypefaceOrDefault()->countGlyphs(); if (glyphRange == 0) { // Some fuzzing environments have no fonts, so empty array is the best // we can do. |