SkAdvancedTypefaceMetrics: getAdvanceData uses std::function

src/core/SkAdvancedTypefaceMetrics.h

Index: src/core/SkAdvancedTypefaceMetrics.h
diff --git a/src/core/SkAdvancedTypefaceMetrics.h b/src/core/SkAdvancedTypefaceMetrics.h
index eae73182158f013847c35b7561c20c45b0c3d2a4..7aeb04d0c09e9815e0e5a800c03197a7fa8bcd52 100644
--- a/src/core/SkAdvancedTypefaceMetrics.h
+++ b/src/core/SkAdvancedTypefaceMetrics.h
@@ -179,14 +179,16 @@ void finishRange(
                          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 Data, typename FontHandle>
+template <typename Data>
 SkAdvancedTypefaceMetrics::AdvanceMetric<Data>* getAdvanceData(
-        FontHandle fontHandle,
         int num_glyphs,
         const uint32_t* glyphIDs,
         uint32_t glyphIDsCount,
-        bool (*getAdvance)(FontHandle fontHandle, int gId, Data* data));
+        std::function<bool(int, Data*)> getAdvance);
 
 } // namespace skia_advanced_typeface_metrics_utils