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

Unified Diff: src/ports/SkFontConfigInterface_android.cpp

Issue 425753002: Remove code only used by SkCreateTypefaceForScript which has already been deleted (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: Created 6 years, 5 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/ports/SkFontConfigInterface_android.cpp
diff --git a/src/ports/SkFontConfigInterface_android.cpp b/src/ports/SkFontConfigInterface_android.cpp
index faf995b304c68496777c0d600f8d01c17ac690da..bdc3d5092a53614e2f2a7664c641320a45747e92 100644
--- a/src/ports/SkFontConfigInterface_android.cpp
+++ b/src/ports/SkFontConfigInterface_android.cpp
@@ -101,8 +101,6 @@ public:
/**
*
*/
- SkTypeface* getTypefaceForChar(SkUnichar uni, SkTypeface::Style style,
- SkPaintOptionsAndroid::FontVariant fontVariant);
SkTypeface* nextLogicalTypeface(SkFontID currFontID, SkFontID origFontID,
const SkPaintOptionsAndroid& options);
SkTypeface* getTypefaceForGlyphID(uint16_t glyphID, const SkTypeface* origTypeface,
@@ -547,32 +545,6 @@ bool SkFontConfigInterfaceAndroid::getFallbackFamilyNameForChar(SkUnichar uni,
return false;
}
-SkTypeface* SkFontConfigInterfaceAndroid::getTypefaceForChar(SkUnichar uni,
- SkTypeface::Style style,
- SkPaintOptionsAndroid::FontVariant fontVariant) {
- FontRecID fontRecID = find_best_style(fFontFamilies[fDefaultFamilyRecID], style);
- SkTypeface* face = this->getTypefaceForFontRec(fontRecID);
-
- SkPaintOptionsAndroid paintOptions;
- paintOptions.setFontVariant(fontVariant);
- paintOptions.setUseFontFallbacks(true);
-
- SkPaint paint;
- paint.setTypeface(face);
- paint.setTextEncoding(SkPaint::kUTF16_TextEncoding);
- paint.setPaintOptionsAndroid(paintOptions);
-
- SkAutoGlyphCache autoCache(paint, NULL, NULL);
- SkGlyphCache* cache = autoCache.getCache();
-
- SkScalerContext* ctx = cache->getScalerContext();
- if (ctx) {
- SkFontID fontID = ctx->findTypefaceIdForChar(uni);
- return SkTypefaceCache::FindByID(fontID);
- }
- return NULL;
-}
-
FallbackFontList* SkFontConfigInterfaceAndroid::getCurrentLocaleFallbackFontList() {
SkString locale = SkFontConfigParser::GetLocale();
if (NULL == fLocaleFallbackFontList || locale != fCachedLocale) {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698