| Index: src/core/SkTypeface.cpp
|
| ===================================================================
|
| --- src/core/SkTypeface.cpp (revision 8262)
|
| +++ src/core/SkTypeface.cpp (working copy)
|
| @@ -97,13 +97,10 @@
|
| }
|
|
|
| SkAdvancedTypefaceMetrics* SkTypeface::getAdvancedTypefaceMetrics(
|
| - SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo,
|
| - const uint32_t* glyphIDs,
|
| - uint32_t glyphIDsCount) const {
|
| - return SkFontHost::GetAdvancedTypefaceMetrics(fUniqueID,
|
| - perGlyphInfo,
|
| - glyphIDs,
|
| - glyphIDsCount);
|
| + SkAdvancedTypefaceMetrics::PerGlyphInfo info,
|
| + const uint32_t* glyphIDs,
|
| + uint32_t glyphIDsCount) const {
|
| + return this->onGetAdvancedTypefaceMetrics(info, glyphIDs, glyphIDsCount);
|
| }
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
| @@ -141,7 +138,7 @@
|
| upem = SkFontHost::GetUnitsPerEm(fUniqueID);
|
| #else
|
| SkAdvancedTypefaceMetrics* metrics;
|
| - metrics = SkFontHost::GetAdvancedTypefaceMetrics(fUniqueID,
|
| + metrics = this->getAdvancedTypefaceMetrics(
|
| SkAdvancedTypefaceMetrics::kNo_PerGlyphInfo,
|
| NULL, 0);
|
| if (metrics) {
|
|
|