Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(869)

Unified Diff: trunk/src/ports/SkHarfBuzzFont.cpp

Issue 13001002: remove GetTable* APIs from SkFontHost, and rely on SkTypeface::onGetTable* (Closed) Base URL: http://skia.googlecode.com/svn/
Patch Set: Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/ports/SkFontHost_tables.cpp ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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;
}
+
« no previous file with comments | « trunk/src/ports/SkFontHost_tables.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698