diff options
author | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-29 13:24:44 +0000 |
---|---|---|
committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-29 13:24:44 +0000 |
commit | a89a22b515e29ea31fffc2bd6cc458e37954b5c0 (patch) | |
tree | 4034769967b364bbb5c1b43c62e7d52a6b3f3ca3 | |
parent | d9ae86ae6e6878092bf8c320f68d23bda27f3866 (diff) | |
download | src-a89a22b515e29ea31fffc2bd6cc458e37954b5c0.tar.gz |
cherrypick rev 10972 into branch m30_1599 to fix http://crbug.com/183830
git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m30_1599/src@11003 2bbb7eff-a529-9590-31e7-b0007b416f81
-rw-r--r-- | ports/SkFontConfigParser_android.cpp | 48 |
1 files changed, 42 insertions, 6 deletions
diff --git a/ports/SkFontConfigParser_android.cpp b/ports/SkFontConfigParser_android.cpp index b1c81599..e8692e91 100644 --- a/ports/SkFontConfigParser_android.cpp +++ b/ports/SkFontConfigParser_android.cpp @@ -163,16 +163,52 @@ static void endElementHandler(void *data, const char *tag) { * families array. */ static void parseConfigFile(const char *filename, SkTDArray<FontFamily*> &families) { - XML_Parser parser = XML_ParserCreate(NULL); - FamilyData *familyData = new FamilyData(&parser, families); - XML_SetUserData(parser, familyData); - XML_SetElementHandler(parser, startElementHandler, endElementHandler); - FILE *file = fopen(filename, "r"); + + FILE* file = NULL; + +#if !defined(SK_BUILD_FOR_ANDROID_FRAMEWORK) + // if we are using a version of Android prior to Android 4.2 (JellyBean MR1 + // at API Level 17) then we need to look for files with a different suffix. + char sdkVersion[PROP_VALUE_MAX]; + __system_property_get("ro.build.version.sdk", sdkVersion); + const int sdkVersionInt = atoi(sdkVersion); + + if (0 != *sdkVersion && sdkVersionInt < 17) { + SkString basename; + SkString updatedFilename; + SkString locale = SkFontConfigParser::GetLocale(); + + basename.set(filename); + // Remove the .xml suffix. We'll add it back in a moment. + if (basename.endsWith(".xml")) { + basename.resize(basename.size()-4); + } + // Try first with language and region + updatedFilename.printf("%s-%s.xml", basename.c_str(), locale.c_str()); + file = fopen(updatedFilename.c_str(), "r"); + if (!file) { + // If not found, try next with just language + updatedFilename.printf("%s-%.2s.xml", basename.c_str(), locale.c_str()); + file = fopen(updatedFilename.c_str(), "r"); + } + } +#endif + + if (NULL == file) { + file = fopen(filename, "r"); + } + // Some of the files we attempt to parse (in particular, /vendor/etc/fallback_fonts.xml) // are optional - failure here is okay because one of these optional files may not exist. - if (file == NULL) { + if (NULL == file) { return; } + + XML_Parser parser = XML_ParserCreate(NULL); + FamilyData *familyData = new FamilyData(&parser, families); + XML_SetUserData(parser, familyData); + XML_SetElementHandler(parser, startElementHandler, endElementHandler); + char buffer[512]; bool done = false; while (!done) { |