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

Unified Diff: ui/gfx/font_list_unittest.cc

Issue 2031223003: Support underline on Linux again. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed the gtk2_ui as well. Created 4 years, 6 months 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 | « chrome/browser/ui/libgtk2ui/gtk2_ui.cc ('k') | ui/gfx/font_render_params_linux_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/font_list_unittest.cc
diff --git a/ui/gfx/font_list_unittest.cc b/ui/gfx/font_list_unittest.cc
index ce373760a0498bde58283481b69fbda64bb48d77..42b27847eeecc90946d1aa55b0fafa209c01e113 100644
--- a/ui/gfx/font_list_unittest.cc
+++ b/ui/gfx/font_list_unittest.cc
@@ -260,15 +260,12 @@ TEST(FontListTest, MAYBE_Fonts_Derive) {
EXPECT_EQ("Arial|13|italic|bold", FontToString(derived_fonts[0]));
EXPECT_EQ("Courier New|13|italic|bold", FontToString(derived_fonts[1]));
- // TODO(mboc): Linux has never supported UNDERLINE. Fix this if possible.
-#if !defined(OS_LINUX)
derived = font_list.Derive(5, Font::UNDERLINE, Font::Weight::BOLD);
const std::vector<Font>& underline_fonts = derived.GetFonts();
EXPECT_EQ(2U, underline_fonts.size());
EXPECT_EQ("Arial|13|underline|bold", FontToString(underline_fonts[0]));
EXPECT_EQ("Courier New|13|underline|bold", FontToString(underline_fonts[1]));
-#endif
}
// TODO(489354): Enable this on android.
« no previous file with comments | « chrome/browser/ui/libgtk2ui/gtk2_ui.cc ('k') | ui/gfx/font_render_params_linux_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698