diff options
| author | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-16 23:10:29 +0000 |
|---|---|---|
| committer | jshin@chromium.org <jshin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-06-16 23:10:29 +0000 |
| commit | f80821f8daed7afa20cec3685a9897460242ba3a (patch) | |
| tree | a604a9a82c33932375cffebe2337df66afa3abc6 /app/gfx/font_unittest.cc | |
| parent | 4c8a86f8e37d96d6e0836215665698ad42577de4 (diff) | |
| download | chromium_src-f80821f8daed7afa20cec3685a9897460242ba3a.zip chromium_src-f80821f8daed7afa20cec3685a9897460242ba3a.tar.gz chromium_src-f80821f8daed7afa20cec3685a9897460242ba3a.tar.bz2 | |
Forcing font size to be >= IDS_MINIMUM_UI_FONT_SIZE (usually 5, but for some
locales more than that).Fixed spelling in font.h.Added windows only unittest for
it.
BUG=2919 (http://crbug.com/2919)
TEST=Pass font_unittest on Windows
Patch by cira
Original Review: http://codereview.chromium.org/125159
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@18552 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/gfx/font_unittest.cc')
| -rw-r--r-- | app/gfx/font_unittest.cc | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/app/gfx/font_unittest.cc b/app/gfx/font_unittest.cc index 3a13e2f6..dc81ca8 100644 --- a/app/gfx/font_unittest.cc +++ b/app/gfx/font_unittest.cc @@ -56,4 +56,23 @@ TEST_F(FontTest, Widths) { ASSERT_GT(cf.GetStringWidth(L"abc"), cf.GetStringWidth(L"ab")); } +#if defined(OS_WIN) +TEST_F(FontTest, DeriveFontResizesIfSizeTooSmall) { + // This creates font of height -8. + Font cf(Font::CreateFont(L"Arial", 6)); + Font derived_font = cf.DeriveFont(-4); + LOGFONT font_info; + GetObject(derived_font.hfont(), sizeof(LOGFONT), &font_info); + EXPECT_EQ(-5, font_info.lfHeight); +} + +TEST_F(FontTest, DeriveFontKeepsOriginalSizeIfHeightOk) { + // This creates font of height -8. + Font cf(Font::CreateFont(L"Arial", 6)); + Font derived_font = cf.DeriveFont(-2); + LOGFONT font_info; + GetObject(derived_font.hfont(), sizeof(LOGFONT), &font_info); + EXPECT_EQ(-6, font_info.lfHeight); +} +#endif } // anonymous namespace |