diff options
author | 2014-07-28 07:44:55 -0700 | |
---|---|---|
committer | 2014-07-28 07:44:55 -0700 | |
commit | 5a27f49a87718bd0e766e79d26de33c829145f13 (patch) | |
tree | 67d81324bcc2ffdc5c71ed7aee4997571400fcd0 /src/ports/SkFontConfigInterface_android.cpp | |
parent | a98683bc50a3fe1241396f0ae20e35c7b1133fa9 (diff) |
Remove code only used by SkCreateTypefaceForScript which has already been deleted
R=tomhudson@google.com, bungeman@google.com
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/425753002
Diffstat (limited to 'src/ports/SkFontConfigInterface_android.cpp')
-rw-r--r-- | src/ports/SkFontConfigInterface_android.cpp | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/src/ports/SkFontConfigInterface_android.cpp b/src/ports/SkFontConfigInterface_android.cpp index faf995b304..bdc3d5092a 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) { |