src/animator/SkPaintPart.h - Issue 1974783002: Revert of 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: src/animator/SkPaintPart.h

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

Patch Set: Created 4 years, 7 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/animator/SkPaintPart.h

diff --git a/src/animator/SkPaintPart.h b/src/animator/SkPaintPart.h

index 5d94f049e86438654d0557dc483bcf7abe4461a2..a7e28ed3e27c40aa9eccfac5d15341297bb00c08 100644

--- a/src/animator/SkPaintPart.h

+++ b/src/animator/SkPaintPart.h

@@ -62,7 +62,8 @@

#ifdef SK_DUMP_ENABLED

void dump(SkAnimateMaker *) override;

#endif

- sk_sp<SkTypeface> getTypeface() { return SkTypeface::MakeFromName(fontName.c_str(), style); }

+ SkTypeface* getTypeface() {

+ return SkTypeface::CreateFromName(fontName.c_str(), style); }

protected:

bool add() override;

SkString fontName;