src/ports/SkFontHost_FreeType_common.h - Issue 1027373002: Font variations.

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/SkFontHost_FreeType_common.h

Issue 1027373002: Font variations. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Update and rebase. Created 5 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/SkFontHost_FreeType_common.h

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

index 36efba011d7b7c05f76ef529456dd8c968233059..f33a98d99640f31777eb86e8d3d7fd8bc0a99894 100644

--- a/src/ports/SkFontHost_FreeType_common.h

+++ b/src/ports/SkFontHost_FreeType_common.h

@@ -44,8 +44,8 @@ public:

Scanner();

~Scanner();

bool recognizedFont(SkStream* stream, int* numFonts) const;

- bool scanFont(SkStream* stream, int ttcIndex,

- SkString* name, SkFontStyle* style, bool* isFixedPitch) const;

+ bool scanFont(SkStream* stream, int ttcIndex, const SkFontStyle::Axis* specifiedAxes, int specifiedAxesCount,

+ SkString* name, SkFontStyle* style, bool* isFixedPitch, SkTArray<SkFixed, true>* axes) const;

private:

FT_Face openFace(SkStream* stream, int ttcIndex, FT_Stream ftStream) const;

FT_Library fLibrary;