diff options
| author | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-29 13:21:38 +0000 |
|---|---|---|
| committer | djsollen@google.com <djsollen@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-08-29 13:21:38 +0000 |
| commit | d9ae86ae6e6878092bf8c320f68d23bda27f3866 (patch) | |
| tree | d2b25bfe671baefb43330f13d389e3921345c5f8 | |
| parent | 3bbbfc90113d7ea025eb48be8b5fbe1ce86c2b96 (diff) | |
| download | src-d9ae86ae6e6878092bf8c320f68d23bda27f3866.tar.gz | |
cherrypick rev 10942 into branch m30_1599 to fix http://crbug.com/274117
git-svn-id: http://skia.googlecode.com/svn/branches/chrome/m30_1599/src@11000 2bbb7eff-a529-9590-31e7-b0007b416f81
| -rw-r--r-- | ports/SkFontConfigInterface_android.cpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/ports/SkFontConfigInterface_android.cpp b/ports/SkFontConfigInterface_android.cpp index e9886188..c9dc944f 100644 --- a/ports/SkFontConfigInterface_android.cpp +++ b/ports/SkFontConfigInterface_android.cpp @@ -183,7 +183,12 @@ static void get_path_for_sys_fonts(SkString* full, const char name[]) { static void insert_into_name_dict(SkTDict<FamilyRecID>& familyNameDict, const char* name, FamilyRecID familyRecID) { SkAutoAsciiToLC tolc(name); - familyNameDict.set(tolc.lc(), familyRecID); + if (familyNameDict.find(tolc.lc())) { + SkDebugf("---- system font attempting to use a the same name [%s] for" + "multiple families. skipping subsequent occurrences", tolc.lc()); + } else { + familyNameDict.set(tolc.lc(), familyRecID); + } } // Defined in SkFontHost_FreeType.cpp |