AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Only lowercase names in Android font config parser.

Browse Source 
BUG=chromium:397549
R=tomhudson@chromium.org, tomhudson@google.com

Author: bungeman@google.com

Review URL: https://codereview.chromium.org/420223003
This commit is contained in:
bungeman 2014-07-28 08:19:45 -07:00 committed by Commit bot
parent 5a27f49a87
commit edb10e79f5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/ports/SkFontConfigParser_android.cpp
View File

@ -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);