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/src@11641 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/ports/SkFontConfigInterface_android.cpp b/ports/SkFontConfigInterface_android.cpp
index 9c188d9..6f9ed3a 100644
--- a/ports/SkFontConfigInterface_android.cpp
+++ b/ports/SkFontConfigInterface_android.cpp
@@ -513,7 +513,14 @@
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 @@
///////////////////////////////////////////////////////////////////////////////
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) {
