src/ports/SkFontConfigTypeface.h - Issue 1873923002: Begin switch to SkFontStyle for legacy calls.

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: src/ports/SkFontConfigTypeface.h

Issue 1873923002: Begin switch to SkFontStyle for legacy calls. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Fixes, rebase. Created 4 years, 8 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: src/ports/SkFontConfigTypeface.h

diff --git a/src/ports/SkFontConfigTypeface.h b/src/ports/SkFontConfigTypeface.h

index a6dc6cae7984ec7a2d8ca12264c37623c339fc9e..68a36e35e1b2041715f85a2ce440c669f83cbf55 100644

--- a/src/ports/SkFontConfigTypeface.h

+++ b/src/ports/SkFontConfigTypeface.h

@@ -39,7 +39,11 @@ public:

return fFamilyName.equals(name);

}

+#ifdef SK_VERY_LEGACY_CREATE_TYPEFACE

static SkTypeface* LegacyCreateTypeface(const char familyName[], SkTypeface::Style);

+#else

+ static SkTypeface* LegacyCreateTypeface(const char familyName[], SkFontStyle);

+#endif

protected:

FontConfigTypeface(const SkFontStyle& style,