diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 14:51:24 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-25 14:51:24 +0000 |
| commit | 4bb36ed2213e8c329077d8a7ee0799b3a3e0ece1 (patch) | |
| tree | 5cf3a8a91ac2bbb3ea17d66546b45e3a7812d029 | |
| parent | c10da4b052a8ba91fc76455d3cc2e50e3bc2b08d (diff) | |
| download | chromium_src-4bb36ed2213e8c329077d8a7ee0799b3a3e0ece1.zip chromium_src-4bb36ed2213e8c329077d8a7ee0799b3a3e0ece1.tar.gz chromium_src-4bb36ed2213e8c329077d8a7ee0799b3a3e0ece1.tar.bz2 | |
linux: add a NonHintedSans font to test_shell
This is used by an upcoming layout test.
http://codereview.chromium.org/1303001
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42612 0039d316-1c4b-4281-b951-d872f2087c98
| -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> |