ui/gfx/render_text_unittest.cc - Issue 19666006: Supports FontList in Textfield.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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: Updates ui_unittests_disabled for Android. 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:

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) {