third_party/WebKit/Source/platform/fonts/linux/FontCacheLinux.cpp - Issue 1685053002: blink fonts: Load Android SkFontMgr 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: third_party/WebKit/Source/platform/fonts/linux/FontCacheLinux.cpp

Issue 1685053002: blink fonts: Load Android SkFontMgr on Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@windows_change

Patch Set: Addressed nyquist's comments. Created 4 years, 10 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

« content/zygote/zygote_main_linux.cc ('K') | « third_party/WebKit/Source/platform/fonts/android/FontCacheAndroid.cpp ('k') | third_party/WebKit/Source/platform/fonts/skia/FontCacheSkia.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/platform/fonts/linux/FontCacheLinux.cpp

diff --git a/third_party/WebKit/Source/platform/fonts/linux/FontCacheLinux.cpp b/third_party/WebKit/Source/platform/fonts/linux/FontCacheLinux.cpp

index 70493006f50a08c7a15fc72e8789726d408a1cbd..3ef9cac311c1f07a2a60e567086388f50ede8f61 100644

--- a/third_party/WebKit/Source/platform/fonts/linux/FontCacheLinux.cpp

+++ b/third_party/WebKit/Source/platform/fonts/linux/FontCacheLinux.cpp

@@ -32,6 +32,17 @@

namespace blink {

+FontCache::FontCache()

+ : m_purgePreventCount(0)

+ if (s_fontManager) {

+ adopted(s_fontManager);

+ m_fontManager = s_fontManager;

+ } else {

+ m_fontManager = nullptr;

+ }

void FontCache::getFontForCharacter(UChar32 c, const char* preferredLocale, FontCache::PlatformFallbackFont* fallbackFont)

{

WebFallbackFont webFallbackFont;