diff options
author | halcanary <halcanary@google.com> | 2016-05-09 06:34:39 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-05-09 06:34:39 -0700 |
commit | 57cd94a9defda8fb37913049f80544d292d99232 (patch) | |
tree | 76b840e02037b88d984fe2b70c6f1c9dc8c4e0e2 /src/core/SkAdvancedTypefaceMetrics.h | |
parent | 74e9a4dcd3772fccfc26b148e43cfcf4e084093f (diff) |
SkAdvancedTypefaceMetrics: getAdvanceData uses std::function
Reduce templatedness.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1955053002
Review-Url: https://codereview.chromium.org/1955053002
Diffstat (limited to 'src/core/SkAdvancedTypefaceMetrics.h')
-rw-r--r-- | src/core/SkAdvancedTypefaceMetrics.h | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/core/SkAdvancedTypefaceMetrics.h b/src/core/SkAdvancedTypefaceMetrics.h index 5e7e59331f..026aec26f4 100644 --- a/src/core/SkAdvancedTypefaceMetrics.h +++ b/src/core/SkAdvancedTypefaceMetrics.h @@ -55,14 +55,11 @@ public: passes back advance data from the typeface. Returns false on failure. */ - template <typename FontHandle> - void setGlyphWidths(FontHandle fontHandle, - int num_glyphs, + typedef std::function<bool(int glyphId, int16_t* advanceData)> GetAdvance; + void setGlyphWidths(int num_glyphs, const uint32_t* subsetGlyphIDs, uint32_t subsetGlyphIDsLength, - bool (*getAdvance)(FontHandle fontHandle, - int gId, - int16_t* data)); + GetAdvance getAdvance); SkString fFontName; |