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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: ui/gfx/render_text_unittest.cc

Issue 19666006: Supports FontList in Textfield. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removes ResourceBundle::Delegate::GetFontList. Created 7 years, 5 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
« ui/base/resource/resource_bundle.cc ('K') | « ui/gfx/render_text_mac.cc ('k') | ui/gfx/render_text_win.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
diff --git a/ui/gfx/render_text_unittest.cc b/ui/gfx/render_text_unittest.cc
index 7b9f9b6ed2bfcb68e7c7823a242acbb0549ef286..400c27b38c4ec1780dd17a8ab0abaf084af88943 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -1198,8 +1198,8 @@ TEST_F(RenderTextTest, StringSizeRespectsFontListMetrics) {
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());
+ EXPECT_EQ("Arial", render_text->GetPrimaryFont().GetFontName());
+ EXPECT_EQ(12, render_text->GetPrimaryFont().GetFontSize());
}
TEST_F(RenderTextTest, SetFontList) {
@@ -1209,7 +1209,7 @@ TEST_F(RenderTextTest, SetFontList) {
ASSERT_EQ(2U, fonts.size());
EXPECT_EQ("Arial", fonts[0].GetFontName());
EXPECT_EQ("Symbol", fonts[1].GetFontName());
- EXPECT_EQ(13, render_text->GetFont().GetFontSize());
+ EXPECT_EQ(13, render_text->GetPrimaryFont().GetFontSize());
}
TEST_F(RenderTextTest, StringSizeBoldWidth) {
« ui/base/resource/resource_bundle.cc ('K') | « ui/gfx/render_text_mac.cc ('k') | ui/gfx/render_text_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698