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

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

index 34a788a9c99b6f9dffa2e40937cc3d89eb5aa5b0..cacc27064f93ebec17cdebaa476bfc8c00bf03cb 100644

--- a/src/fonts/SkGScalerContext.cpp

+++ b/src/fonts/SkGScalerContext.cpp

@@ -158,7 +158,7 @@ void SkGScalerContext::generateFontMetrics(SkPaint::FontMetrics* metrics) {

#include "SkTypefaceCache.h"

SkGTypeface::SkGTypeface(SkTypeface* proxy, const SkPaint& paint)

- : SkTypeface(proxy->style(), SkTypefaceCache::NewFontID(), false)

+ : SkTypeface(proxy->fontStyle(), SkTypefaceCache::NewFontID(), false)

, fProxy(SkRef(proxy))

, fPaint(paint) {}