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 5e7e59331f73e44bbf65a14537fb6f5c15742e93..026aec26f46ecf111af504469ac5d708cd1856f5 100644
--- a/src/core/SkAdvancedTypefaceMetrics.h
+++ b/src/core/SkAdvancedTypefaceMetrics.h
@@ -55,14 +55,11 @@ public:
                              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;