SkAdvancedTypefaceMetrics: getAdvanceData uses std::function

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 1699 matching lines @@
 }
 
 void LogFontTypeface::onGetFontDescriptor(SkFontDescriptor* desc,
                                           bool* isLocalStream) const {
     SkString familyName;
     this->onGetFamilyName(&familyName);
     desc->setFamilyName(familyName.c_str());
     *isLocalStream = this->fSerializeAsStream;
 }
 
-static bool getWidthAdvance(HDC 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;
-}
-
 SkAdvancedTypefaceMetrics* LogFontTypeface::onGetAdvancedTypefaceMetrics(
         PerGlyphInfo perGlyphInfo,
         const uint32_t* glyphIDs,
         uint32_t glyphIDsCount) const {
     LOGFONT lf = fLogFont;
     SkAdvancedTypefaceMetrics* info = nullptr;
 
     HDC hdc = CreateCompatibleDC(nullptr);
     HFONT font = CreateFontIndirect(&lf);
     HFONT savefont = (HFONT)SelectObject(hdc, font);
@@ skipping 88 matching lines @@
     }
 
     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(hdc, glyphCount, glyphIDs,
-                                 glyphIDsCount, &getWidthAdvance);
+            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);
 
@@ skipping 655 matching lines @@
 
 private:
     SkTDArray<ENUMLOGFONTEX> fLogFontArray;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkFontMgr* SkFontMgr_New_GDI() { return new SkFontMgrGDI; }
 
 #endif//defined(SK_BUILD_FOR_WIN32)