SkAdvancedTypefaceMetrics: getAdvanceData uses std::function

src/core/SkAdvancedTypefaceMetrics.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkAdvancedTypefaceMetrics.h"
 #include "SkTypes.h"
 
-#if defined(SK_BUILD_FOR_WIN)
-#include <dwrite.h>
-#endif
-
-// forward declare structs needed for getAdvanceData() template for freetype
-struct FT_FaceRec_;
-typedef struct FT_FaceRec_* FT_Face;
-
-#ifdef SK_BUILD_FOR_MAC
-#import <ApplicationServices/ApplicationServices.h>
-#endif
-
-#ifdef SK_BUILD_FOR_IOS
-#include <CoreText/CoreText.h>
-#include <CoreGraphics/CoreGraphics.h>
-#include <CoreFoundation/CoreFoundation.h>
-#endif
-
 SkAdvancedTypefaceMetrics::~SkAdvancedTypefaceMetrics() {}
 
 const int16_t kInvalidAdvance = SK_MinS16;
 const int16_t kDontCareAdvance = SK_MinS16 + 1;
 
 static void stripUninterestingTrailingAdvancesFromRange(
         SkAdvancedTypefaceMetrics::WidthRange* range) {
     SkASSERT(range);
 
     int expectedAdvanceCount = range->fEndId - range->fStartId + 1;
@@ skipping 40 matching lines @@
         if (range->fEndId == range->fStartId) {
             range->fType = SkAdvancedTypefaceMetrics::WidthRange::kRange;
         }
         newLength = 1;
     }
     SkASSERT(range->fAdvance.count() >= newLength);
     range->fAdvance.setCount(newLength);
     zeroWildcardsInRange(range);
 }
 
-template <typename FontHandle>
 void SkAdvancedTypefaceMetrics::setGlyphWidths(
-        FontHandle fontHandle,
         int num_glyphs,
         const uint32_t* subsetGlyphIDs,
         uint32_t subsetGlyphIDsLength,
-        bool (*getAdvance)(FontHandle fontHandle, int gId, int16_t* data)) {
+        SkAdvancedTypefaceMetrics::GetAdvance getAdvance) {
     // Assuming that on average, the ASCII representation of an advance plus
     // a space is 8 characters and the ASCII representation of a glyph id is 3
     // characters, then the following cut offs for using different range types
     // apply:
     // The cost of stopping and starting the range is 7 characers
     //  a. Removing 4 0's or don't care's is a win
     // The cost of stopping and starting the range plus a run is 22
     // characters
     //  b. Removing 3 repeating advances is a win
     //  c. Removing 2 repeating advances and 3 don't cares is a win
@@ skipping 21 matching lines @@
 
     for (int gId = firstIndex; gId <= lastIndex; gId++) {
         int16_t advance = kInvalidAdvance;
         if (gId < lastIndex) {
             // Get glyph id only when subset is nullptr, or the id is in subset.
             SkASSERT(!subsetGlyphIDs || (subsetIndex < subsetGlyphIDsLength &&
                     static_cast<uint32_t>(gId) <= subsetGlyphIDs[subsetIndex]));
             if (!subsetGlyphIDs ||
                 (subsetIndex < subsetGlyphIDsLength &&
                  static_cast<uint32_t>(gId) == subsetGlyphIDs[subsetIndex])) {
-                SkAssertResult(getAdvance(fontHandle, gId, &advance));
+                SkAssertResult(getAdvance(gId, &advance));
                 ++subsetIndex;
             } else {
                 advance = kDontCareAdvance;
             }
         }
         if (advance == lastAdvance) {
             repeatedAdvances++;
             trailingWildCards = 0;
         } else if (advance == kDontCareAdvance) {
             wildCardsInRun++;
@@ skipping 56 matching lines @@
         SkASSERT(prevRange);
         if (!prevRange) {
             fGlyphWidths.reset();
             return;  // https://crbug.com/567031
         }
     } else {
         FinishRange(&curRange, lastIndex - 1, WidthRange::kRange);
         fGlyphWidths.emplace_back(std::move(curRange));
     }
 }
-
-// Make AdvanceMetric template functions available for linking with typename
-// WidthRange and VerticalAdvanceRange.
-template void SkAdvancedTypefaceMetrics::setGlyphWidths(
-        FT_Face face,
-        int num_glyphs,
-        const uint32_t* subsetGlyphIDs,
-        uint32_t subsetGlyphIDsLength,
-        bool (*getAdvance)(FT_Face face, int gId, int16_t* data));
-
-#if defined(SK_BUILD_FOR_WIN)
-template void SkAdvancedTypefaceMetrics::setGlyphWidths(
-        HDC hdc,
-        int num_glyphs,
-        const uint32_t* subsetGlyphIDs,
-        uint32_t subsetGlyphIDsLength,
-        bool (*getAdvance)(HDC hdc, int gId, int16_t* data));
-template void SkAdvancedTypefaceMetrics::setGlyphWidths(
-        IDWriteFontFace* fontFace,
-        int num_glyphs,
-        const uint32_t* subsetGlyphIDs,
-        uint32_t subsetGlyphIDsLength,
-        bool (*getAdvance)(IDWriteFontFace* fontFace, int gId, int16_t* data));
-#elif defined(SK_BUILD_FOR_MAC) || defined(SK_BUILD_FOR_IOS)
-template void SkAdvancedTypefaceMetrics::setGlyphWidths(
-        CTFontRef ctFont,
-        int num_glyphs,
-        const uint32_t* subsetGlyphIDs,
-        uint32_t subsetGlyphIDsLength,
-        bool (*getAdvance)(CTFontRef ctFont, int gId, int16_t* data));
-#endif
-// additional declaration needed for testing with a face of an unknown type
-template void SkAdvancedTypefaceMetrics::setGlyphWidths(
-        void* fontData,
-        int num_glyphs,
-        const uint32_t* subsetGlyphIDs,
-        uint32_t subsetGlyphIDsLength,
-        bool (*getAdvance)(void* fontData, int gId, int16_t* data));