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

Unified Diff: ui/views/controls/label_unittest.cc

Issue 10228009: Fix CJK font linking size on Windows XP. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 8 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
« ui/gfx/render_text_win.cc ('K') | « ui/ui_unittests.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/label_unittest.cc
===================================================================
--- ui/views/controls/label_unittest.cc (revision 133692)
+++ ui/views/controls/label_unittest.cc (working copy)
@@ -16,18 +16,15 @@
// All text sizing measurements (width and height) should be greater than this.
const int kMinTextDimension = 4;
-#if defined(OS_WIN)
-// Courier is failing on linux because it's non scalable.
TEST(LabelTest, FontPropertyCourier) {
Label label;
std::string font_name("courier");
- gfx::Font font(font_name, 30);
+ gfx::Font font(font_name, 26);
msw 2012/04/26 21:04:42 Is this test fragile wrt the font size? If so, ple
Alexei Svitkine (slow) 2012/04/26 21:45:56 Done. It also turns out that the Linux failure was
label.SetFont(font);
gfx::Font font_used = label.font();
EXPECT_EQ(font_name, font_used.GetFontName());
- EXPECT_EQ(30, font_used.GetFontSize());
+ EXPECT_EQ(26, font_used.GetFontSize());
}
-#endif
TEST(LabelTest, FontPropertyArial) {
Label label;
« ui/gfx/render_text_win.cc ('K') | « ui/ui_unittests.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698