summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-16 23:42:58 +0000
committervandebo@chromium.org <vandebo@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-06-16 23:42:58 +0000
commit3bd386d1da67498cba15c64dbffe41bc76b4e199 (patch)
tree6caf77c6c0a41b9c529dd5d9978a90688d4ed803
parent6647bd9cac9644507458dfee7e0ce6142371c743 (diff)
downloadchromium_src-3bd386d1da67498cba15c64dbffe41bc76b4e199.zip
chromium_src-3bd386d1da67498cba15c64dbffe41bc76b4e199.tar.gz
chromium_src-3bd386d1da67498cba15c64dbffe41bc76b4e199.tar.bz2
TTF: Enable disabled tests: FontTest.DeriveFont{ResizesIfSizeTooSmall,KeepsOriginalSizeIfHeightOk}
Is there a reason these are disabled? It looks like they were just forgotten. TEST=none BUG=disabled tests Review URL: http://codereview.chromium.org/2839003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50055 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--gfx/font_unittest.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/gfx/font_unittest.cc b/gfx/font_unittest.cc
index d2310f8..6e63951 100644
--- a/gfx/font_unittest.cc
+++ b/gfx/font_unittest.cc
@@ -58,8 +58,8 @@ TEST_F(FontTest, Widths) {
}
#if defined(OS_WIN)
-// TODO(beng): re-enable evening of 3/22.
-TEST_F(FontTest, DISABLED_DeriveFontResizesIfSizeTooSmall) {
+// http://crbug.com/46733
+TEST_F(FontTest, FAILS_DeriveFontResizesIfSizeTooSmall) {
// This creates font of height -8.
Font cf(Font::CreateFont(L"Arial", 6));
Font derived_font = cf.DeriveFont(-4);
@@ -68,7 +68,7 @@ TEST_F(FontTest, DISABLED_DeriveFontResizesIfSizeTooSmall) {
EXPECT_EQ(-5, font_info.lfHeight);
}
-TEST_F(FontTest, DISABLED_DeriveFontKeepsOriginalSizeIfHeightOk) {
+TEST_F(FontTest, DeriveFontKeepsOriginalSizeIfHeightOk) {
// This creates font of height -8.
Font cf(Font::CreateFont(L"Arial", 6));
Font derived_font = cf.DeriveFont(-2);