SkAdvancedTypefaceMetrics: getAdvanceData uses std::function

src/ports/SkFontHost_FreeType.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 "SkAdvancedTypefaceMetrics.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 414 matching lines @@
 static bool GetLetterCBox(FT_Face face, char letter, FT_BBox* bbox) {
     const FT_UInt glyph_id = FT_Get_Char_Index(face, letter);
     if (!glyph_id)
         return false;
     if (FT_Load_Glyph(face, glyph_id, FT_LOAD_NO_SCALE) != 0)
         return false;
     FT_Outline_Get_CBox(&face->glyph->outline, bbox);
     return true;
 }
 
-static bool getWidthAdvance(FT_Face face, int gId, int16_t* data) {
-    FT_Fixed advance = 0;
-    if (FT_Get_Advances(face, gId, 1, FT_LOAD_NO_SCALE, &advance)) {
-        return false;
-    }
-    SkASSERT(data);
-    *data = advance;
-    return true;
-}
-
 static void populate_glyph_to_unicode(FT_Face& face, SkTDArray<SkUnichar>* glyphToUnicode) {
     FT_Long numGlyphs = face->num_glyphs;
     glyphToUnicode->setCount(SkToInt(numGlyphs));
     sk_bzero(glyphToUnicode->begin(), sizeof((*glyphToUnicode)[0]) * numGlyphs);
 
     FT_UInt glyphIndex;
     SkUnichar charCode = FT_Get_First_Char(face, &glyphIndex);
     while (glyphIndex) {
         SkASSERT(glyphIndex < SkToUInt(numGlyphs));
         (*glyphToUnicode)[glyphIndex] = charCode;
@@ skipping 153 matching lines @@
                 for (int i = 0; i < advanceCount; i++) {
                     int16_t advance = advances[i];
                     range.fAdvance.append(1, &advance);
                 }
             }
             SkAdvancedTypefaceMetrics::FinishRange(
                     &range, face->num_glyphs - 1,
                     SkAdvancedTypefaceMetrics::WidthRange::kRange);
             info->fGlyphWidths.emplace_back(std::move(range));
         } else {
-            info->setGlyphWidths(face, face->num_glyphs, glyphIDs,
-                                 glyphIDsCount, &getWidthAdvance);
+            info->setGlyphWidths(
+                    face->num_glyphs, glyphIDs, glyphIDsCount,
+                    SkAdvancedTypefaceMetrics::GetAdvance(
+                            [face](int gId, int16_t* data) {
+                                FT_Fixed advance = 0;
+                                if (FT_Get_Advances(face, gId, 1,
+                                                    FT_LOAD_NO_SCALE, &advance)) {
+                                    return false;
+                                }
+                                SkASSERT(data);
+                                *data = advance;
+                                return true;
+                            }));
         }
     }
 
     if (perGlyphInfo & kVAdvance_PerGlyphInfo &&
             FT_HAS_VERTICAL(face)) {
         SkASSERT(false);  // Not implemented yet.
     }
 
     if (perGlyphInfo & kGlyphNames_PerGlyphInfo &&
             info->fType == SkAdvancedTypefaceMetrics::kType1_Font) {
@@ skipping 1186 matching lines @@
                 SkDEBUGF(("Requested font axis not found: %s '%c%c%c%c'\n",
                           name.c_str(),
                           (skTag >> 24) & 0xFF,
                           (skTag >> 16) & 0xFF,
                           (skTag >>  8) & 0xFF,
                           (skTag)       & 0xFF));
             }
         }
     )
 }