sky/engine/platform/fonts/FontCache.h - Issue 723343002: Update from https://crrev.com/304121

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: sky/engine/platform/fonts/FontCache.h

Issue 723343002: Update from https://crrev.com/304121 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 1 month 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: sky/engine/platform/fonts/FontCache.h

diff --git a/sky/engine/platform/fonts/FontCache.h b/sky/engine/platform/fonts/FontCache.h

index e68a6cca0b08651193c60f3c2746a0c03a670a30..c41c6adb630ff80719f3f5b441592c9cf911871e 100644

--- a/sky/engine/platform/fonts/FontCache.h

+++ b/sky/engine/platform/fonts/FontCache.h

@@ -94,7 +94,7 @@ public:

#endif

#if OS(ANDROID)

- static AtomicString getGenericFamilyNameForScript(const AtomicString& familyName, UScriptCode);

+ static AtomicString getGenericFamilyNameForScript(const AtomicString& familyName, const FontDescription&);

#else

struct PlatformFallbackFont {

String name;