SkAdvancedTypefaceMetrics: getAdvanceData uses std::function

src/ports/SkFontHost_mac.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"  // Keep this before any #ifdef ...
 #if defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
 
@@ skipping 1606 matching lines @@
         }
     }
 
     if (perGlyphInfo & kHAdvance_PerGlyphInfo) {
         if (info->fStyle & SkAdvancedTypefaceMetrics::kFixedPitch_Style) {
             skia_advanced_typeface_metrics_utils::appendRange(&info->fGlyphWidths, 0);
             info->fGlyphWidths->fAdvance.append(1, &min_width);
             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;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static SK_SFNT_ULONG get_font_type_tag(const SkTypeface_Mac* typeface) {
     CTFontRef ctFont = typeface->fFontRef.get();
     AutoCFRelease<CFNumberRef> fontFormatRef(
@@ skipping 932 matching lines @@
 
         return SkSafeRef(GetDefaultFace());
     }
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkFontMgr* SkFontMgr::Factory() { return new SkFontMgr_Mac; }
 
 #endif//defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)