diff options
| author | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-11 00:42:26 +0000 |
|---|---|---|
| committer | yusukes@google.com <yusukes@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-11 00:42:26 +0000 |
| commit | 88c3cbdccc1803d82c446a5d78acd49d94fb4855 (patch) | |
| tree | c5b51750e9b75be033aa12d76d81c6a64bbdb024 /skia | |
| parent | f4acfae80866fff2e2fc760c396ba89db57de522 (diff) | |
| download | chromium_src-88c3cbdccc1803d82c446a5d78acd49d94fb4855.zip chromium_src-88c3cbdccc1803d82c446a5d78acd49d94fb4855.tar.gz chromium_src-88c3cbdccc1803d82c446a5d78acd49d94fb4855.tar.bz2 | |
Second fix for the Issue 12530. Modified Match() function so that it allows the following case:
requested family: A
post_config_family: B
post_match_family: A
BUG=12530
TEST=none
Review URL: http://codereview.chromium.org/192062
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25959 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'skia')
| -rw-r--r-- | skia/ext/SkFontHost_fontconfig_direct.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/skia/ext/SkFontHost_fontconfig_direct.cpp b/skia/ext/SkFontHost_fontconfig_direct.cpp index a7caadb..3f19fc7 100644 --- a/skia/ext/SkFontHost_fontconfig_direct.cpp +++ b/skia/ext/SkFontHost_fontconfig_direct.cpp @@ -162,8 +162,15 @@ bool FontConfigDirect::Match(std::string* result_family, family_names_match = family.empty() ? true : - strcasecmp((char *)post_config_family, - (char *)post_match_family) == 0; + (strcasecmp((char *)post_config_family, + (char *)post_match_family) == 0 || + // Workaround for Issue 12530: + // requested family: "Bitstream Vera Sans" + // post_config_family: "Arial" + // post_match_family: "Bitstream Vera Sans" + // -> We should treat this case as a good match. + strcasecmp(family.c_str(), + (char *)post_match_family) == 0); if (family_names_match) break; } |