src/core/SkFontStyle.cpp - Issue 2171163002: Add test for typeface style round trip.

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/core/SkFontStyle.cpp

Issue 2171163002: Add test for typeface style round trip. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Fix whitespace, test on Linux. Created 4 years, 5 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/core/SkFontStyle.cpp

diff --git a/src/core/SkFontStyle.cpp b/src/core/SkFontStyle.cpp

index 01628ae9d9d4ccdceb774ec31ab591f53cb7d9f6..c6de81885fc9222cf49166b34e964e552df83003 100644

--- a/src/core/SkFontStyle.cpp

+++ b/src/core/SkFontStyle.cpp

@@ -18,7 +18,7 @@ SkFontStyle::SkFontStyle() {

SkFontStyle::SkFontStyle(int weight, int width, Slant slant) {

fUnion.fU32 = 0;

- fUnion.fR.fWeight = SkTPin<int>(weight, kThin_Weight, kBlack_Weight);

+ fUnion.fR.fWeight = SkTPin<int>(weight, 0, 1000);

fUnion.fR.fWidth = SkTPin<int>(width, kUltraCondensed_Width, kUltaExpanded_Width);

fUnion.fR.fSlant = SkTPin<int>(slant, kUpright_Slant, kOblique_Slant);

}