aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/ports/SkFontConfigParser_android.cpp
diff options
context:
space:
mode:
authorGravatar bungeman <bungeman@google.com>2014-07-28 08:19:45 -0700
committerGravatar Commit bot <commit-bot@chromium.org>2014-07-28 08:19:45 -0700
commitedb10e79f5cd1b48baa77f82705d4e711fb35ba4 (patch)
treea079ece38ad38c8409eb437f7e9e7fd4bd5b68a1 /src/ports/SkFontConfigParser_android.cpp
parent5a27f49a87718bd0e766e79d26de33c829145f13 (diff)
Only lowercase names in Android font config parser.
BUG=chromium:397549 R=tomhudson@chromium.org, tomhudson@google.com Author: bungeman@google.com Review URL: https://codereview.chromium.org/420223003
Diffstat (limited to 'src/ports/SkFontConfigParser_android.cpp')
-rw-r--r--src/ports/SkFontConfigParser_android.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/ports/SkFontConfigParser_android.cpp b/src/ports/SkFontConfigParser_android.cpp
index fc8e9199c3..cc2ca8cad9 100644
--- a/src/ports/SkFontConfigParser_android.cpp
+++ b/src/ports/SkFontConfigParser_android.cpp
@@ -51,15 +51,16 @@ struct FamilyData {
* or file tag. The resulting strings are put into the fNames or FontFileInfo arrays.
*/
static void textHandler(void *data, const char *s, int len) {
- SkAutoAsciiToLC tolc(s);
FamilyData *familyData = (FamilyData*) data;
// Make sure we're in the right state to store this name information
if (familyData->currentFamily &&
(familyData->currentTag == NAMESET_TAG || familyData->currentTag == FILESET_TAG)) {
switch (familyData->currentTag) {
- case NAMESET_TAG:
+ case NAMESET_TAG: {
+ SkAutoAsciiToLC tolc(s, len);
familyData->currentFamily->fNames.push_back().set(tolc.lc(), len);
break;
+ }
case FILESET_TAG:
if (familyData->currentFontInfo) {
familyData->currentFontInfo->fFileName.set(s, len);