summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--skia/ext/SkFontHost_fontconfig_direct.cpp11
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;
}