| Index: src/core/SkTypeface.cpp
|
| diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp
|
| index bbf3f44896b191866d10c821d4d6359b6e55d301..0f5d70b1a8ccbe28ce2c51252223e2e70f11ed31 100644
|
| --- a/src/core/SkTypeface.cpp
|
| +++ b/src/core/SkTypeface.cpp
|
| @@ -35,7 +35,7 @@ protected:
|
| }
|
| void onFilterRec(SkScalerContextRec*) const override { }
|
| virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics(
|
| - SkAdvancedTypefaceMetrics::PerGlyphInfo,
|
| + PerGlyphInfo,
|
| const uint32_t*, uint32_t) const override { return NULL; }
|
| void onGetFontDescriptor(SkFontDescriptor*, bool*) const override { }
|
| virtual int onCharsToGlyphs(const void* chars, Encoding encoding,
|
| @@ -265,7 +265,7 @@ void SkTypeface::getFamilyName(SkString* name) const {
|
| }
|
|
|
| SkAdvancedTypefaceMetrics* SkTypeface::getAdvancedTypefaceMetrics(
|
| - SkAdvancedTypefaceMetrics::PerGlyphInfo info,
|
| + PerGlyphInfo info,
|
| const uint32_t* glyphIDs,
|
| uint32_t glyphIDsCount) const {
|
| SkAdvancedTypefaceMetrics* result =
|
|
|