include/ports/SkFontConfigInterface.h - Issue 1933393002: Move SkTypeface to sk_sp.

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: include/ports/SkFontConfigInterface.h

Issue 1933393002: Move SkTypeface to sk_sp. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Make vc++ happy. Created 4 years, 8 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: include/ports/SkFontConfigInterface.h

diff --git a/include/ports/SkFontConfigInterface.h b/include/ports/SkFontConfigInterface.h

index 3c68a242e54f0a270fbae89d4b715dec59086b7b..ad25f06415e9708bb466d563c9f7219bfc0d3201 100644

--- a/include/ports/SkFontConfigInterface.h

+++ b/include/ports/SkFontConfigInterface.h

@@ -102,7 +102,7 @@ public:

* Callers are responsible for unref-ing the result.

virtual SkTypeface* createTypeface(const FontIdentity& identity) {

tomhudson 2016/04/29 21:10:36 We can wait until a future patch to make this retu

bungeman-skia 2016/04/29 22:03:23 Acknowledged.

- return SkTypeface::CreateFromStream(this->openStream(identity), identity.fTTCIndex);

+ return SkTypeface::MakeFromStream(this->openStream(identity), identity.fTTCIndex).release();

}

/**