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) { |