src/ports/SkFontMgr_win_dw.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/ports/SkFontMgr_win_dw.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/ports/SkFontMgr_win_dw.cpp

diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp

index ecca57ff513da78da6dcbcb63eb4785004917e4e..38d21cde39fce8dd71c98d4746a891b25034ca28 100644

--- a/src/ports/SkFontMgr_win_dw.cpp

+++ b/src/ports/SkFontMgr_win_dw.cpp

@@ -331,7 +331,7 @@ struct ProtoDWriteTypeface {

IDWriteFontFamily* fDWriteFontFamily;

};

-static bool FindByDWriteFont(SkTypeface* cached, SkTypeface::Style, void* ctx) {

+static bool FindByDWriteFont(SkTypeface* cached, SkFontStyle, void* ctx) {

DWriteFontTypeface* cshFace = reinterpret_cast<DWriteFontTypeface*>(cached);

ProtoDWriteTypeface* ctxFace = reinterpret_cast<ProtoDWriteTypeface*>(ctx);

bool same;