diff options
| -rw-r--r-- | skia/ext/SkFontHost_fontconfig_direct.cpp | 4 | ||||
| -rw-r--r-- | webkit/tools/test_shell/resources/linux-fontconfig-config | 17 |
2 files changed, 18 insertions, 3 deletions
diff --git a/skia/ext/SkFontHost_fontconfig_direct.cpp b/skia/ext/SkFontHost_fontconfig_direct.cpp index f2cdff8..ba30031 100644 --- a/skia/ext/SkFontHost_fontconfig_direct.cpp +++ b/skia/ext/SkFontHost_fontconfig_direct.cpp @@ -87,9 +87,7 @@ static bool IsFallbackFontAllowed(const std::string& family) const char* family_cstr = family.c_str(); return strcasecmp(family_cstr, "sans") == 0 || strcasecmp(family_cstr, "serif") == 0 || - strcasecmp(family_cstr, "monospace") == 0 || - // This is a special case used for a layout test - strcasecmp(family_cstr, "NonAntiAliasedSans") == 0; + strcasecmp(family_cstr, "monospace") == 0; } bool FontConfigDirect::Match(std::string* result_family, diff --git a/webkit/tools/test_shell/resources/linux-fontconfig-config b/webkit/tools/test_shell/resources/linux-fontconfig-config index b9e6b80..be214c6 100644 --- a/webkit/tools/test_shell/resources/linux-fontconfig-config +++ b/webkit/tools/test_shell/resources/linux-fontconfig-config @@ -135,4 +135,21 @@ <const>hintslight</const> </edit> </match> + + <match target="pattern"> + <test name="family" compare="eq"> + <string>NonHintedSans</string> + </test> + <edit name="family" mode="assign"> + <string>Verdana</string> + </edit> + <!-- These deliberately contradict each other. The 'hinting' preference + should take priority --> + <edit name="hintstyle" mode="assign"> + <const>hintfull</const> + </edit> + <edit name="hinting" mode="assign"> + <bool>false</bool> + </edit> + </match> </fontconfig> |