| Index: ui/gfx/render_text_unittest.cc
|
| ===================================================================
|
| --- ui/gfx/render_text_unittest.cc (revision 157127)
|
| +++ ui/gfx/render_text_unittest.cc (working copy)
|
| @@ -1002,7 +1002,7 @@
|
| TEST_F(RenderTextTest, StringSizeEmptyString) {
|
| const Font font;
|
| scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
|
| - render_text->SetFontList(FontList(font));
|
| + render_text->SetFont(font);
|
|
|
| render_text->SetText(string16());
|
| EXPECT_EQ(font.GetHeight(), render_text->GetStringSize().height());
|
| @@ -1013,6 +1013,13 @@
|
| }
|
| #endif // !defined(OS_MACOSX)
|
|
|
| +TEST_F(RenderTextTest, SetFont) {
|
| + scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
|
| + render_text->SetFont(Font("Arial", 12));
|
| + EXPECT_EQ("Arial", render_text->GetFont().GetFontName());
|
| + EXPECT_EQ(12, render_text->GetFont().GetFontSize());
|
| +}
|
| +
|
| TEST_F(RenderTextTest, StringSizeBoldWidth) {
|
| scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
|
| render_text->SetText(UTF8ToUTF16("Hello World"));
|
| @@ -1056,14 +1063,14 @@
|
|
|
| for (size_t i = 0; i < ARRAYSIZE_UNSAFE(cases); i++) {
|
| scoped_ptr<RenderText> render_text(RenderText::CreateInstance());
|
| - render_text->SetFontList(FontList(default_font));
|
| + render_text->SetFont(default_font);
|
| render_text->SetText(cases[i].text);
|
|
|
| const int height1 = render_text->GetStringSize().height();
|
| EXPECT_GT(height1, 0);
|
|
|
| // Check that setting the larger font increases the height.
|
| - render_text->SetFontList(FontList(larger_font));
|
| + render_text->SetFont(larger_font);
|
| const int height2 = render_text->GetStringSize().height();
|
| EXPECT_GT(height2, height1);
|
| }
|
|
|