diff options
| author |  commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-07 19:49:13 +0000 |
|---|---|---|
| committer | commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-10-07 19:49:13 +0000 |
| commit | c0445fec1983465a2c985a2c88e796678585d68a (patch) | |
| tree | 9d534aca8cfa35016141a06ba52b9910956fe588 /src/ports | |
| parent | f00031a4876fd56bae2fe873f88f897a8414fef4 (diff) | |
Fix ambiguity in API if no matching system language is found
R=reed@google.com, wangxianzhu@chromium.org
Author: djsollen@google.com
Review URL: https://codereview.chromium.org/26325003
git-svn-id: http://skia.googlecode.com/svn/trunk@11641 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/ports')
| -rw-r--r-- | src/ports/SkFontConfigInterface_android.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/ports/SkFontConfigInterface_android.cpp b/src/ports/SkFontConfigInterface_android.cpp index 9c188d90c6..6f9ed3a93b 100644 --- a/src/ports/SkFontConfigInterface_android.cpp +++ b/src/ports/SkFontConfigInterface_android.cpp @@ -513,7 +513,14 @@ SkTypeface* SkFontConfigInterfaceAndroid::getTypefaceForFontRec(FontRecID fontRe bool SkFontConfigInterfaceAndroid::getFallbackFamilyNameForChar(SkUnichar uni, const char* lang, SkString* name) { - FallbackFontList* fallbackFontList = this->findFallbackFontList(lang); + FallbackFontList* fallbackFontList = NULL; + const SkString langTag(lang); + if (langTag.isEmpty()) { + fallbackFontList = this->getCurrentLocaleFallbackFontList(); + } else { + fallbackFontList = this->findFallbackFontList(langTag); + } + for (int i = 0; i < fallbackFontList->count(); i++) { FamilyRecID familyRecID = fallbackFontList->getAt(i); @@ -733,9 +740,8 @@ SkTypeface* SkFontConfigInterfaceAndroid::getTypefaceForGlyphID(uint16_t glyphID /////////////////////////////////////////////////////////////////////////////// bool SkGetFallbackFamilyNameForChar(SkUnichar uni, SkString* name) { - SkString locale = SkFontConfigParser::GetLocale(); SkFontConfigInterfaceAndroid* fontConfig = getSingletonInterface(); - return fontConfig->getFallbackFamilyNameForChar(uni, locale.c_str(), name); + return fontConfig->getFallbackFamilyNameForChar(uni, NULL, name); } bool SkGetFallbackFamilyNameForChar(SkUnichar uni, const char* lang, SkString* name) { |