include/core/SkFontStyle.h - Issue 488143002: Replace SkTypeface::Style with SkFontStyle.

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: include/core/SkFontStyle.h

Issue 488143002: Replace SkTypeface::Style with SkFontStyle. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Clean up weight detection. Created 6 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: include/core/SkFontStyle.h

diff --git a/include/ports/SkFontStyle.h b/include/core/SkFontStyle.h

similarity index 97%

rename from include/ports/SkFontStyle.h

rename to include/core/SkFontStyle.h

index 9d9a912d7d74406dd7705318c02e806c97ee0427..9ebec48608981e004471f0fae49110e7abc39a79 100644

--- a/include/ports/SkFontStyle.h

+++ b/include/core/SkFontStyle.h

@@ -43,6 +43,7 @@ public:

SkFontStyle();

SkFontStyle(int weight, int width, Slant);

+ explicit SkFontStyle(unsigned oldStyle);

bool operator==(const SkFontStyle& rhs) const {

return fUnion.fU32 == rhs.fUnion.fU32;