diff options
| author |  Ben Wagner <bungeman@google.com> | 2018-03-29 11:18:06 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-05 22:37:33 +0000 |
| commit | 5ddb30862509967eca24ba3831cc11ed5396eee7 (patch) | |
| tree | 85e8919cee2be60a66581b137ef861d783c583f4 /src/ports/SkFontHost_win.cpp | |
| parent | b45aac961db511e805525c6d32125e8958983ab4 (diff) | |
Distinguish between glyphs with empty path and no path.
BUG=skia:4904
Change-Id: I065e3b4d8596b415ddaf094d7f9a4b65da64d4d4
Reviewed-on: https://skia-review.googlesource.com/117280
Commit-Queue: Ben Wagner <bungeman@google.com>
Reviewed-by: Herb Derby <herb@google.com>
Diffstat (limited to 'src/ports/SkFontHost_win.cpp')
| -rw-r--r-- | src/ports/SkFontHost_win.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index abe1550a01..7bc1e298aa 100644 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -551,7 +551,7 @@ protected: void generateAdvance(SkGlyph* glyph) override; void generateMetrics(SkGlyph* glyph) override; void generateImage(const SkGlyph& glyph) override; - void generatePath(SkGlyphID glyph, SkPath* path) override; + bool generatePath(SkGlyphID glyph, SkPath* path) override; void generateFontMetrics(SkPaint::FontMetrics*) override; private: @@ -1614,7 +1614,7 @@ DWORD SkScalerContext_GDI::getGDIGlyphPath(SkGlyphID glyph, UINT flags, return total_size; } -void SkScalerContext_GDI::generatePath(SkGlyphID glyph, SkPath* path) { +bool SkScalerContext_GDI::generatePath(SkGlyphID glyph, SkPath* path) { SkASSERT(path); SkASSERT(fDDC); @@ -1636,7 +1636,7 @@ void SkScalerContext_GDI::generatePath(SkGlyphID glyph, SkPath* path) { SkAutoSTMalloc<BUFFERSIZE, uint8_t> glyphbuf(BUFFERSIZE); DWORD total_size = getGDIGlyphPath(glyph, format, &glyphbuf); if (0 == total_size) { - return; + return false; } if (fRec.getHinting() != SkPaint::kSlight_Hinting) { @@ -1648,7 +1648,7 @@ void SkScalerContext_GDI::generatePath(SkGlyphID glyph, SkPath* path) { SkAutoSTMalloc<BUFFERSIZE, uint8_t> hintedGlyphbuf(BUFFERSIZE); DWORD hinted_total_size = getGDIGlyphPath(glyph, format, &hintedGlyphbuf); if (0 == hinted_total_size) { - return; + return false; } if (!sk_path_from_gdi_paths(path, glyphbuf, total_size, @@ -1658,6 +1658,7 @@ void SkScalerContext_GDI::generatePath(SkGlyphID glyph, SkPath* path) { sk_path_from_gdi_path(path, glyphbuf, total_size); } } + return true; } static void logfont_for_name(const char* familyName, LOGFONT* lf) { |