Index: src/ports/SkFontHost_FreeType.cpp |
=================================================================== |
--- src/ports/SkFontHost_FreeType.cpp (revision 8262) |
+++ src/ports/SkFontHost_FreeType.cpp (working copy) |
@@ -447,12 +447,10 @@ |
} |
} |
-// static |
-SkAdvancedTypefaceMetrics* SkFontHost::GetAdvancedTypefaceMetrics( |
- uint32_t fontID, |
+SkAdvancedTypefaceMetrics* SkTypeface_FreeType::onGetAdvancedTypefaceMetrics( |
SkAdvancedTypefaceMetrics::PerGlyphInfo perGlyphInfo, |
const uint32_t* glyphIDs, |
- uint32_t glyphIDsCount) { |
+ uint32_t glyphIDsCount) const { |
#if defined(SK_BUILD_FOR_MAC) |
return NULL; |
#else |
@@ -464,7 +462,7 @@ |
libInit = gFTLibrary; |
} |
SkAutoTCallIProc<struct FT_LibraryRec_, FT_Done_FreeType> ftLib(libInit); |
- SkFaceRec* rec = ref_ft_face(fontID); |
+ SkFaceRec* rec = ref_ft_face(this->uniqueID()); |
if (NULL == rec) |
return NULL; |
FT_Face face = rec->fFace; |