SkAdvancedTypefaceMetrics: getAdvanceData uses std::function

src/ports/SkFontHost_win.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 "SkTypes.h"
 #if defined(SK_BUILD_FOR_WIN32)
 
@@ skipping 1822 matching lines @@
         }
     }
 
     if (perGlyphInfo & kHAdvance_PerGlyphInfo) {
         if (info->fStyle & SkAdvancedTypefaceMetrics::kFixedPitch_Style) {
             appendRange(&info->fGlyphWidths, 0);
             info->fGlyphWidths->fAdvance.append(1, &min_width);
             finishRange(info->fGlyphWidths.get(), 0,
                         SkAdvancedTypefaceMetrics::WidthRange::kDefault);
         } else {
+            std::function<bool(int gId, int16_t* data)> getWidthAdvanceFn =
+                [hdc](int gId, int16_t* advance) {
+                    return getWidthAdvance(hdc, gId, advance);
+                };
             info->fGlyphWidths.reset(
-                getAdvanceData(hdc,
-                               glyphCount,
+                getAdvanceData(glyphCount,
                                glyphIDs,
                                glyphIDsCount,
-                               &getWidthAdvance));
+                               getWidthAdvanceFn));
         }
     }
 
 Error:
 ReturnInfo:
     SelectObject(hdc, savefont);
     DeleteObject(designFont);
     DeleteObject(font);
     DeleteDC(hdc);
 
@@ skipping 655 matching lines @@
 
 private:
     SkTDArray<ENUMLOGFONTEX> fLogFontArray;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkFontMgr* SkFontMgr_New_GDI() { return new SkFontMgrGDI; }
 
 #endif//defined(SK_BUILD_FOR_WIN32)