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

Unified Diff: src/ports/SkFontHost_FreeType.cpp

Issue 12807004: move impl of AdvancedTypefaceMetrics into typeface (3) (Closed) Base URL: http://skia.googlecode.com/svn/trunk/
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
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;

Powered by Google App Engine
This is Rietveld 408576698