SkAdvancedTypefaceMetrics: getAdvanceData uses std::function

src/core/SkAdvancedTypefaceMetrics.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkAdvancedTypefaceMetrics_DEFINED
 #define SkAdvancedTypefaceMetrics_DEFINED
@@ skipping 37 matching lines @@
         @param glyphIDs      For per-glyph info, specify subset of the
                              font by giving glyph ids.  Each integer
                              represents a glyph id.  Passing nullptr
                              means all glyphs in the font.
         @param glyphIDsCount Number of elements in subsetGlyphIds.
                              Ignored if glyphIDs is nullptr.
         @param  getAdvance   A function that takes a glyph id and
                              passes back advance data from the
                              typeface.  Returns false on failure.
     */
-    template <typename FontHandle>
-    void setGlyphWidths(FontHandle fontHandle,
-                        int num_glyphs,
+    typedef std::function<bool(int glyphId, int16_t* advanceData)> GetAdvance;
+    void setGlyphWidths(int num_glyphs,
                         const uint32_t* subsetGlyphIDs,
                         uint32_t subsetGlyphIDsLength,
-                        bool (*getAdvance)(FontHandle fontHandle,
-                                           int gId,
-                                           int16_t* data));
+                        GetAdvance getAdvance);
 
     SkString fFontName;
 
     enum FontType {
         kType1_Font,
         kType1CID_Font,
         kCFF_Font,
         kTrueType_Font,
         kOther_Font,
     };
@@ skipping 87 matching lines @@
     static void FinishRange(WidthRange* range,
                             int endId,
                             WidthRange::MetricType type);
 
 private:
     typedef SkRefCnt INHERITED;
 };
 
 
 #endif