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

Unified Diff: ui/gfx/render_text_unittest.cc

Issue 10933129: Add RenderText::SetFont() function to simplify some call sites. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 3 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
« no previous file with comments | « ui/gfx/render_text.cc ('k') | ui/views/controls/textfield/native_textfield_views.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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);
}
« no previous file with comments | « ui/gfx/render_text.cc ('k') | ui/views/controls/textfield/native_textfield_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698