diff options
| author |  tomhudson <tomhudson@chromium.org> | 2014-08-12 07:42:16 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-08-12 07:42:16 -0700 |
| commit | b3d4af512e9d60019790cf42701ac62edb3f5b00 (patch) | |
| tree | 3b6300ece288e7e09f24ced23cd0141d6e8e06b3 | |
| parent | 9c6d4d744a9e0375d0e7d7a7b19558f5259fc3c3 (diff) | |
Fix lower-casing error in font config parser
The Android font config parser was missing some SkAutoAsciiToLC
instantiations; this was discovered in https://crrev.com/458543002/
but should land independently.
BUG=chromium:400801
R=bungeman@google.com
Author: tomhudson@chromium.org
Review URL: https://codereview.chromium.org/465973002
| -rw-r--r-- | src/ports/SkFontConfigParser_android.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ports/SkFontConfigParser_android.cpp b/src/ports/SkFontConfigParser_android.cpp index 11fde84ae5..c6a3cf261f 100644 --- a/src/ports/SkFontConfigParser_android.cpp +++ b/src/ports/SkFontConfigParser_android.cpp @@ -92,7 +92,8 @@ void familyElementHandler(FontFamily* family, const char** attributes) { size_t nameLen = strlen(name); size_t valueLen = strlen(value); if (nameLen == 4 && !strncmp("name", name, nameLen)) { - family->fNames.push_back().set(value); + SkAutoAsciiToLC tolc(value); + family->fNames.push_back().set(tolc.lc()); } else if (nameLen == 4 && !strncmp("lang", name, nameLen)) { family->fLanguage = SkLanguage (value); } else if (nameLen == 7 && !strncmp("variant", name, nameLen)) { @@ -168,7 +169,8 @@ void aliasElementHandler(FamilyData* familyData, const char** attributes) { const char* value = attributes[i+1]; size_t nameLen = strlen(name); if (nameLen == 4 && !strncmp("name", name, nameLen)) { - aliasName.set(value); + SkAutoAsciiToLC tolc(value); + aliasName.set(tolc.lc()); } else if (nameLen == 2 && !strncmp("to", name, nameLen)) { to.set(value); } else if (nameLen == 6 && !strncmp("weight", name, nameLen)) { |