ui/gfx/render_text_mac.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_mac.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:

Index: ui/gfx/render_text_mac.cc

diff --git a/ui/gfx/render_text_mac.cc b/ui/gfx/render_text_mac.cc

index cfc7a5154823010bb004935be5404b8fd972d73a..c56c62638f7e37153ec380f07a511865da9c2a8e 100644

--- a/ui/gfx/render_text_mac.cc

+++ b/ui/gfx/render_text_mac.cc

@@ -107,7 +107,7 @@ void RenderTextMac::EnsureLayout() {

runs_.clear();

runs_valid_ = false;

- const Font& font = GetFont();

+ const Font& font = GetPrimaryFont();

base::ScopedCFTypeRef<CFStringRef> font_name_cf_string(

base::SysUTF8ToCFStringRef(font.GetFontName()));

base::ScopedCFTypeRef<CTFontRef> ct_font(