content/renderer/render_view_linux.cc - Issue 2138613002: Set the font family for the "system-ui" generic font family on Linux

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: content/renderer/render_view_linux.cc

Issue 2138613002: Set the font family for the "system-ui" generic font family on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: jochen review nit (add braces) Created 4 years, 2 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/public/common/renderer_preferences.h ('k') | third_party/WebKit/LayoutTests/platform/linux/inspector-protocol/layout-fonts/generic-system-ui-expected.txt » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/render_view_linux.cc

diff --git a/content/renderer/render_view_linux.cc b/content/renderer/render_view_linux.cc

index 490f7b4065e0d2f846e85cd9003a753b814c3760..335874cdaa6e682f18dd8bee7b719e75503e04c6 100644

--- a/content/renderer/render_view_linux.cc

+++ b/content/renderer/render_view_linux.cc

@@ -69,6 +69,12 @@ void RenderViewImpl::UpdateFontRenderingFromRendererPrefs() {

prefs.default_font_size <= kMaxDefaultFontSize) {

WebFontRendering::setDefaultFontSize(prefs.default_font_size);

}

+#if !defined(OS_ANDROID)

+ if (!prefs.system_font_family_name.empty()) {

+ WebFontRendering::setSystemFontFamily(

+ blink::WebString::fromUTF8(prefs.system_font_family_name));

+ }

+#endif

}

} // namespace content