src/fonts/SkTestScalerContext.cpp - 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: src/fonts/SkTestScalerContext.cpp

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: src/fonts/SkTestScalerContext.cpp

diff --git a/src/fonts/SkTestScalerContext.cpp b/src/fonts/SkTestScalerContext.cpp

index ee379f0a3852afe6463980369bccff082100240a..ed0934781b3a92d478b1941d8335052d614eefe0 100644

--- a/src/fonts/SkTestScalerContext.cpp

+++ b/src/fonts/SkTestScalerContext.cpp

@@ -110,8 +110,8 @@ void SkTestFont::init(const SkScalar* pts, const unsigned char* verbs) {

fPaths[index] = path;

}

-SkTestTypeface::SkTestTypeface(SkTestFont* testFont, SkTypeface::Style style)

+SkTestTypeface::SkTestTypeface(SkTestFont* testFont, SkFontStyle style)

: SkTypeface(style, SkTypefaceCache::NewFontID(), false)

, fTestFont(testFont) {

}