ui/gfx/render_text_win.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_win.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_win.cc

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

index e38d263f8ba84bddf574e7ce4246777a3f8d60be..ac018de3f446226f8e39276ee65f24ebf1e76478 100644

--- a/ui/gfx/render_text_win.cc

+++ b/ui/gfx/render_text_win.cc

@@ -578,7 +578,7 @@ void RenderTextWin::ItemizeLogicalText() {

for (size_t run_break = 0; run_break < layout_text_length;) {

internal::TextRun* run = new internal::TextRun();

run->range.set_start(run_break);

- run->font = GetFont();

+ run->font = GetPrimaryFont();

run->font_style = (style.style(BOLD) ? Font::BOLD : 0) |

(style.style(ITALIC) ? Font::ITALIC : 0);

DeriveFontIfNecessary(run->font.GetFontSize(), run->font.GetHeight(),