Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(460)

Unified Diff: ui/gfx/font_render_params_linux_unittest.cc

Issue 811123002: linux/chromeos: Improve querying for Fontconfig defaults. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert expectation reordering Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/gfx/font_render_params_linux.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/font_render_params_linux_unittest.cc
diff --git a/ui/gfx/font_render_params_linux_unittest.cc b/ui/gfx/font_render_params_linux_unittest.cc
index 46a4fcfaac27f036693448205271b265cc92db1e..120c7aebd1e6aa0f2bdc567903bb0f269dbe51c5 100644
--- a/ui/gfx/font_render_params_linux_unittest.cc
+++ b/ui/gfx/font_render_params_linux_unittest.cc
@@ -47,7 +47,8 @@ class TestFontDelegate : public LinuxFontDelegate {
};
// Loads the first system font defined by fontconfig_util_linux.h with a base
-// filename of |basename|. Case is ignored.
+// filename of |basename|. Case is ignored. FcFontMatch() requires there to be
+// at least one font present.
bool LoadSystemFont(const std::string& basename) {
for (size_t i = 0; i < kNumSystemFontsForFontconfig; ++i) {
base::FilePath path(gfx::kSystemFontsForFontconfig[i]);
@@ -89,21 +90,24 @@ TEST_F(FontRenderParamsTest, Default) {
ASSERT_TRUE(LoadSystemFont("arial.ttf"));
ASSERT_TRUE(LoadConfigDataIntoFontconfig(temp_dir_.path(),
std::string(kFontconfigFileHeader) +
- kFontconfigMatchPatternHeader +
+ // Specify the desired defaults via a font match rather than a pattern
+ // match (since this is the style generally used in /etc/fonts/conf.d).
+ kFontconfigMatchFontHeader +
CreateFontconfigEditStanza("antialias", "bool", "true") +
CreateFontconfigEditStanza("autohint", "bool", "true") +
CreateFontconfigEditStanza("hinting", "bool", "true") +
CreateFontconfigEditStanza("hintstyle", "const", "hintslight") +
CreateFontconfigEditStanza("rgba", "const", "rgb") +
kFontconfigMatchFooter +
- // Add a font match for Arial; it shouldn't be used when querying for
- // default settings: http://crbug.com/421247
+ // Add a font match for Arial. Since it specifies a family, it shouldn't
+ // take effect when querying default settings.
kFontconfigMatchFontHeader +
CreateFontconfigTestStanza("family", "eq", "string", "Arial") +
CreateFontconfigEditStanza("antialias", "bool", "true") +
CreateFontconfigEditStanza("autohint", "bool", "false") +
CreateFontconfigEditStanza("hinting", "bool", "true") +
CreateFontconfigEditStanza("hintstyle", "const", "hintfull") +
+ CreateFontconfigEditStanza("rgba", "const", "none") +
kFontconfigMatchFooter +
kFontconfigFileFooter));
« no previous file with comments | « ui/gfx/font_render_params_linux.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698