diff options
| author | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 15:16:04 +0000 |
|---|---|---|
| committer | joi@chromium.org <joi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-12 15:16:04 +0000 |
| commit | b22558a183cefa554a1730188a51994504100351 (patch) | |
| tree | 1761e4f23e2e9060ff7bfa5a9026a4937d73e312 /gfx/font_unittest.cc | |
| parent | 3f891cf79f72f4768a15bfae051e08b9211ed8c3 (diff) | |
| download | chromium_src-b22558a183cefa554a1730188a51994504100351.zip chromium_src-b22558a183cefa554a1730188a51994504100351.tar.gz chromium_src-b22558a183cefa554a1730188a51994504100351.tar.bz2 | |
Revert 71167 - Remove wstring from gfx.
BUG=68882
TEST=no visible changes; all tests pass
Review URL: http://codereview.chromium.org/6121004
TBR=avi@chromium.org
Review URL: http://codereview.chromium.org/6134010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71169 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gfx/font_unittest.cc')
| -rw-r--r-- | gfx/font_unittest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gfx/font_unittest.cc b/gfx/font_unittest.cc index 43eaa7c..3f26507 100644 --- a/gfx/font_unittest.cc +++ b/gfx/font_unittest.cc @@ -46,35 +46,35 @@ int ScopedMinimumFontSizeCallback::minimum_size_ = 0; TEST_F(FontTest, LoadArial) { - Font cf(ASCIIToUTF16("Arial"), 16); + Font cf(L"Arial", 16); ASSERT_TRUE(cf.GetNativeFont()); ASSERT_EQ(cf.GetStyle(), Font::NORMAL); ASSERT_EQ(cf.GetFontSize(), 16); - ASSERT_EQ(cf.GetFontName(), ASCIIToUTF16("Arial")); + ASSERT_EQ(cf.GetFontName(), L"Arial"); } TEST_F(FontTest, LoadArialBold) { - Font cf(ASCIIToUTF16("Arial"), 16); + Font cf(L"Arial", 16); Font bold(cf.DeriveFont(0, Font::BOLD)); ASSERT_TRUE(bold.GetNativeFont()); ASSERT_EQ(bold.GetStyle(), Font::BOLD); } TEST_F(FontTest, Ascent) { - Font cf(ASCIIToUTF16("Arial"), 16); + Font cf(L"Arial", 16); ASSERT_GT(cf.GetBaseline(), 2); ASSERT_LE(cf.GetBaseline(), 22); } TEST_F(FontTest, Height) { - Font cf(ASCIIToUTF16("Arial"), 16); + Font cf(L"Arial", 16); ASSERT_GE(cf.GetHeight(), 16); // TODO(akalin): Figure out why height is so large on Linux. ASSERT_LE(cf.GetHeight(), 26); } TEST_F(FontTest, AvgWidths) { - Font cf(ASCIIToUTF16("Arial"), 16); + Font cf(L"Arial", 16); ASSERT_EQ(cf.GetExpectedTextWidth(0), 0); ASSERT_GT(cf.GetExpectedTextWidth(1), cf.GetExpectedTextWidth(0)); ASSERT_GT(cf.GetExpectedTextWidth(2), cf.GetExpectedTextWidth(1)); @@ -82,7 +82,7 @@ TEST_F(FontTest, AvgWidths) { } TEST_F(FontTest, Widths) { - Font cf(ASCIIToUTF16("Arial"), 16); + Font cf(L"Arial", 16); ASSERT_EQ(cf.GetStringWidth(ASCIIToUTF16("")), 0); ASSERT_GT(cf.GetStringWidth(ASCIIToUTF16("a")), cf.GetStringWidth(ASCIIToUTF16(""))); |