SkAdvancedTypefaceMetrics: getAdvanceData uses std::function

src/ports/SkTypeface_win_dw.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * 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 432 matching lines @@
     if (perGlyphInfo & kHAdvance_PerGlyphInfo) {
         if (fixedWidth) {
             SkAdvancedTypefaceMetrics::WidthRange range(0);
             int16_t advance;
             getWidthAdvance(fDWriteFontFace.get(), 1, &advance);
             range.fAdvance.append(1, &advance);
             SkAdvancedTypefaceMetrics::FinishRange(
                     &range, 0, SkAdvancedTypefaceMetrics::WidthRange::kDefault);
             info->fGlyphWidths.emplace_back(std::move(range));
         } else {
-            info->setGlyphWidths(fDWriteFontFace.get(), glyphCount, glyphIDs,
-                                 glyphIDsCount, getWidthAdvance);
+            IDWriteFontFace* borrowedFontFace = fDWriteFontFace.get();
+            info->setGlyphWidths(
+                    glyphCount, glyphIDs, glyphIDsCount,
+                    SkAdvancedTypefaceMetrics::GetAdvance(
+                            [borrowedFontFace](int gId, int16_t* data) {
+                                return getWidthAdvance(borrowedFontFace, gId, data);
+                            }));
         }
     }
 
     return info;
 }
 #endif//defined(SK_BUILD_FOR_WIN32)