ui/gfx/font_render_params_linux.cc - Issue 1819753003: Allow various font weights in gfx.

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/font_render_params_linux.cc

Issue 1819753003: Allow various font weights in gfx. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Further Mac and Linux fixes. Created 4 years, 9 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/font_render_params_linux.cc

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

index 526c19d0188c64eb0f426e260eae620a8758840f..6b8f98baa23e79028beaf6f154984c7d01f4d932 100644

--- a/ui/gfx/font_render_params_linux.cc

+++ b/ui/gfx/font_render_params_linux.cc

@@ -116,7 +116,9 @@ bool QueryFontconfig(const FontRenderParamsQuery& query,

FcPatternAddInteger(query_pattern.get(), FC_SLANT,

(query.style & Font::ITALIC) ? FC_SLANT_ITALIC : FC_SLANT_ROMAN);

FcPatternAddInteger(query_pattern.get(), FC_WEIGHT,

- (query.style & Font::BOLD) ? FC_WEIGHT_BOLD : FC_WEIGHT_NORMAL);

+ (query.weight == Font::Weight::INVALID)

+ ? static_cast<int>(Font::Weight::NORMAL)

+ : static_cast<int>(query.weight));

}

FcConfigSubstitute(NULL, query_pattern.get(), FcMatchPattern);