Correct advances for 'monospace' fonts in PDF.

src/ports/SkFontHost_win.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkTypes.h"
 #if defined(SK_BUILD_FOR_WIN32)
 
@@ skipping 1800 matching lines @@
         if (GetCharABCWidths(hdc, stem_chars[i], stem_chars[i], &abcWidths)) {
             int16_t width = abcWidths.abcB;
             if (width > 0 && width < min_width) {
                 min_width = width;
                 info->fStemV = min_width;
             }
         }
     }
 
     if (perGlyphInfo & kHAdvance_PerGlyphInfo) {
-        if (info->fStyle & SkAdvancedTypefaceMetrics::kFixedPitch_Style) {
-            SkAdvancedTypefaceMetrics::WidthRange range(0);
-            range.fAdvance.append(1, &min_width);
-            SkAdvancedTypefaceMetrics::FinishRange(
-                    &range, 0, SkAdvancedTypefaceMetrics::WidthRange::kDefault);
-            info->fGlyphWidths.emplace_back(std::move(range));
-        } else {
-            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;
-                })
-            );
-        }
+        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);
     DeleteObject(designFont);
     DeleteObject(font);
     DeleteDC(hdc);
 
     return info;
@@ skipping 654 matching lines @@
 
 private:
     SkTDArray<ENUMLOGFONTEX> fLogFontArray;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkFontMgr* SkFontMgr_New_GDI() { return new SkFontMgrGDI; }
 
 #endif//defined(SK_BUILD_FOR_WIN32)