Index: trunk/src/ports/SkHarfBuzzFont.cpp |
=================================================================== |
--- trunk/src/ports/SkHarfBuzzFont.cpp (revision 8303) |
+++ trunk/src/ports/SkHarfBuzzFont.cpp (working copy) |
@@ -166,9 +166,9 @@ |
HB_Error SkHarfBuzzFont::GetFontTableFunc(void* voidface, const HB_Tag tag, |
HB_Byte* buffer, HB_UInt* len) { |
SkHarfBuzzFont* font = reinterpret_cast<SkHarfBuzzFont*>(voidface); |
- uint32_t uniqueID = SkTypeface::UniqueID(font->getTypeface()); |
+ SkTypeface* typeface = font->getTypeface(); |
- const size_t tableSize = SkFontHost::GetTableSize(uniqueID, tag); |
+ const size_t tableSize = typeface->getTableSize(tag); |
if (!tableSize) { |
return HB_Err_Invalid_Argument; |
} |
@@ -182,6 +182,7 @@ |
// is this right, or should we just copy less than the full table? |
return HB_Err_Invalid_Argument; |
} |
- SkFontHost::GetTableData(uniqueID, tag, 0, tableSize, buffer); |
+ typeface->getTableData(tag, 0, tableSize, buffer); |
return HB_Err_Ok; |
} |
+ |