src/animator/SkDrawPaint.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: src/animator/SkDrawPaint.cpp

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

Patch Set: Restore deleted Android code. 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/SkDrawPaint.cpp

diff --git a/src/animator/SkDrawPaint.cpp b/src/animator/SkDrawPaint.cpp

index 1336ea2dc429b0039b0ff1fcea3f745bef96b9e4..1026630eb11f9bc698eecfb970248a29311ab3f4 100644

--- a/src/animator/SkDrawPaint.cpp

+++ b/src/animator/SkDrawPaint.cpp

@@ -259,7 +259,7 @@ void SkDrawPaint::setupPaint(SkPaint* paint) const {

if (typeface == nullptr)

paint->setTypeface(nullptr);

else if (typeface != (SkDrawTypeface*) -1)

- SkSafeUnref(paint->setTypeface(typeface->getTypeface()));

+ paint->setTypeface(typeface->getTypeface());

if (underline != -1)

paint->setUnderlineText(SkToBool(underline));

if (xfermode != -1)

« no previous file with comments | « samplecode/SampleXfermodesBlur.cpp ('k') | src/animator/SkPaintPart.h » ('j') | no next file with comments »