gm/fontscalerdistortable.cpp - 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: gm/fontscalerdistortable.cpp

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: gm/fontscalerdistortable.cpp

diff --git a/gm/fontscalerdistortable.cpp b/gm/fontscalerdistortable.cpp

index f83365bb3e59821dac80a97f0e896a2452dfdc95..e41006ee5753f2438d99c7e8b49a0ab5bbcd4e45 100644

--- a/gm/fontscalerdistortable.cpp

+++ b/gm/fontscalerdistortable.cpp

@@ -58,7 +58,7 @@ protected:

SkFourByteTag tag = SkSetFourByteTag('w','g','h','t');

SkScalar styleValue = SkDoubleToScalar(0.5 + (5*j + i) * ((2.0 - 0.5) / (2 * 5)));

SkFontMgr::FontParameters::Axis axes[] = { { tag, styleValue } };

- SkAutoTUnref<SkTypeface> typeface(fontMgr->createFromStream(

+ sk_sp<SkTypeface> typeface(fontMgr->createFromStream(

distortable->duplicate(), SkFontMgr::FontParameters().setAxes(axes, 1)));

paint.setTypeface(typeface);

tomhudson 2016/04/29 21:10:36 std::move(), if we're going to get rid of setTypef

bungeman-skia 2016/04/29 22:03:23 Missed that one. Done.