third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp - Issue 2137483004: Enable "system-ui" generic font 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: third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp

Issue 2137483004: Enable "system-ui" generic font family (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Refactor and cleanup 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:

Index: third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp

diff --git a/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp b/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp

index f29a489bd0eb85e6bf2b5296e4d59d677e83c6a1..5bbe845c672f3d8059fbd9949db9a686610a6a78 100644

--- a/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp

+++ b/third_party/WebKit/Source/platform/fonts/win/FontCacheSkiaWin.cpp

@@ -76,6 +76,11 @@ void FontCache::addSideloadedFontForTesting(SkTypeface* typeface) {

}

// static

+const AtomicString& FontCache::systemFontFamily(float) {

+ return menuFontFamily();

+// static

void FontCache::setMenuFontMetrics(const wchar_t* familyName,

int32_t fontHeight) {

s_menuFontFamilyName = new AtomicString(familyName);