SkAdvancedTypefaceMetrics: getAdvanceData uses std::function

src/ports/SkFontHost_mac.cpp

Index: src/ports/SkFontHost_mac.cpp
diff --git a/src/ports/SkFontHost_mac.cpp b/src/ports/SkFontHost_mac.cpp
index 8593b396117ced96e3a4414b2d069fe03e849ecb..5fa0b07313504cb35cd55dc0fb0db8569e477844 100644
--- a/src/ports/SkFontHost_mac.cpp
+++ b/src/ports/SkFontHost_mac.cpp
@@ -1624,12 +1624,17 @@ SkAdvancedTypefaceMetrics* SkTypeface_Mac::onGetAdvancedTypefaceMetrics(
             skia_advanced_typeface_metrics_utils::finishRange(info->fGlyphWidths.get(), 0,
                         SkAdvancedTypefaceMetrics::WidthRange::kDefault);
         } else {
+            auto fontData = ctFont.get();
+            std::function<bool(int gId, int16_t* data)> getWidthAdvanceFn =

[bungeman-skia, 2016/05/09 00:14:08]

There's no particular reason to give these function objects names, this could
all be

            CTFontRef borrowedCTFont = ctFont.get();
           
info->fGlyphWidths.reset(skia_advanced_typeface_metrics_utils::getAdvanceData(
                SkToInt(glyphCount),
                glyphIDs,
                glyphIDsCount,
                std::function<bool(int, int16_t*)>([borrowedCTFont](int gId,
int16_t* data) {
                    CGSize advance;
                    advance.width = 0;
                    CGGlyph glyph = gId;
                    CTFontGetAdvancesForGlyphs(borrowedCTFont,
kCTFontHorizontalOrientation,
                                               &glyph, &advance, 1);
                    *data = sk_float_round2int(advance.width);
                    return true;
                })
            ));

Which also inlines the actual work, which only wasn't being done before because
lambdas didn't exist at the time. Now that we're using a lambda, it seems
awkward to leave the work out of line.

[hal.canary, 2016/05/09 12:15:08]

Done.

+                [fontData](int gId, int16_t* data) {
+                return getWidthAdvance(fontData, gId, data);
+            };
             info->fGlyphWidths.reset(
-                skia_advanced_typeface_metrics_utils::getAdvanceData(ctFont.get(),
+                skia_advanced_typeface_metrics_utils::getAdvanceData(
                                SkToInt(glyphCount),
                                glyphIDs,
                                glyphIDsCount,
-                               &getWidthAdvance));
+                               getWidthAdvanceFn));
         }
     }
     return info;