src/ports/SkFontHost_win.cpp - Issue 23058002: allow both GDI and DW fontmgrs at the same time

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/SkFontHost_win.cpp

Issue 23058002: allow both GDI and DW fontmgrs at the same time (Closed) Base URL: https://skia.googlecode.com/svn/trunk

Patch Set: make cache private to DW Created 7 years, 4 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/SkFontHost_win.cpp

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

index 017c1eab7655f727cd0331768b280989a8871a87..b49ae7b7fd34ffc447e43b2a336415aa687550b2 100755

--- a/src/ports/SkFontHost_win.cpp

+++ b/src/ports/SkFontHost_win.cpp

@@ -2371,6 +2371,14 @@ SkTypeface* SkFontHost::CreateTypefaceFromStream(SkStream* stream) {

#endif

-SkFontMgr* SkFontMgr::Factory() {

+extern SkFontMgr* SkFontMgr_New_GDI();

+extern SkFontMgr* SkFontMgr_New_DirectWrite();

+SkFontMgr* SkFontMgr_New_GDI() {

return SkNEW(SkFontMgrGDI);

}

+SkFontMgr* SkFontMgr::Factory() {

+ return SkFontMgr_New_GDI();