| Index: src/ports/SkFontHost_win.cpp
|
| diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp
|
| index fa5c9722b81b8aca73e82c48e28b37298f54bc01..a2d9da7a39461ce4d7e1d209a744e74816ccbb3e 100644
|
| --- a/src/ports/SkFontHost_win.cpp
|
| +++ b/src/ports/SkFontHost_win.cpp
|
| @@ -1818,29 +1818,6 @@ SkAdvancedTypefaceMetrics* LogFontTypeface::onGetAdvancedTypefaceMetrics(
|
| }
|
| }
|
|
|
| - if (perGlyphInfo & kHAdvance_PerGlyphInfo) {
|
| - info->setGlyphWidths(
|
| - glyphCount,
|
| - glyphIDs,
|
| - glyphIDsCount,
|
| - SkAdvancedTypefaceMetrics::GetAdvance([hdc](int gId, int16_t* advance) {
|
| - // Initialize the MAT2 structure to
|
| - // the identify transformation matrix.
|
| - static const MAT2 mat2 = {
|
| - SkScalarToFIXED(1), SkScalarToFIXED(0),
|
| - SkScalarToFIXED(0), SkScalarToFIXED(1)};
|
| - int flags = GGO_METRICS | GGO_GLYPH_INDEX;
|
| - GLYPHMETRICS gm;
|
| - if (GDI_ERROR == GetGlyphOutline(hdc, gId, flags, &gm, 0, nullptr, &mat2)) {
|
| - return false;
|
| - }
|
| - SkASSERT(advance);
|
| - *advance = gm.gmCellIncX;
|
| - return true;
|
| - })
|
| - );
|
| - }
|
| -
|
| Error:
|
| ReturnInfo:
|
| SelectObject(hdc, savefont);
|
|
|