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

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: Synced. 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.h ('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 1573128d4d049f6de71e287940071144c9ddf389..fd455b17a7480667095d9f617cd0ee472982c8e9 100644
--- a/ui/gfx/render_text_unittest.cc
+++ b/ui/gfx/render_text_unittest.cc
@@ -1145,8 +1145,8 @@ TEST_F(RenderTextTest, StringSizeEmptyString) {
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, StringSizeBoldWidth) {
« ui/base/resource/resource_bundle.h ('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