ui/gfx/render_text_pango.cc - Issue 142523003: Renames gfx::FontList::Derive* family.

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_pango.cc

Issue 142523003: Renames gfx::FontList::Derive* family. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Addressed comments and more fixes. Created 6 years, 11 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_pango.cc

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

index 29f3ffd774b19518f5724ff32b632e27e354b3d8..bffa2d4c74bb7b4dc3d9af50d513607fec211d5e 100644

--- a/ui/gfx/render_text_pango.cc

+++ b/ui/gfx/render_text_pango.cc

@@ -353,7 +353,7 @@ void RenderTextPango::SetupPangoAttributes(PangoLayout* layout) {

const size_t italic_end = styles()[ITALIC].GetRange(italic).end();

const size_t style_end = std::min(bold_end, italic_end);

if (style != font_list().GetFontStyle()) {

- FontList derived_font_list = font_list().DeriveFontList(style);

+ FontList derived_font_list = font_list().Derive(0, style);

ScopedPangoFontDescription desc(pango_font_description_from_string(

derived_font_list.GetFontDescriptionString().c_str()));