src/svg/SkSVGDevice.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/svg/SkSVGDevice.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/svg/SkSVGDevice.cpp

diff --git a/src/svg/SkSVGDevice.cpp b/src/svg/SkSVGDevice.cpp

index 4c679dfee7095ee75fc764dc21b12ac05ebde554..f0805b5432b96b9f38d77713728a0599811b7795 100644

--- a/src/svg/SkSVGDevice.cpp

+++ b/src/svg/SkSVGDevice.cpp

@@ -534,8 +534,8 @@ void SkSVGDevice::AutoElement::addTextAttributes(const SkPaint& paint) {

SkString familyName;

SkTHashSet<SkString> familySet;

- SkAutoTUnref<const SkTypeface> tface(paint.getTypeface() ?

- SkRef(paint.getTypeface()) : SkTypeface::RefDefault());

+ sk_sp<const SkTypeface> tface(paint.getTypeface() ?

+ sk_ref_sp(paint.getTypeface()) : SkTypeface::MakeDefault());

SkASSERT(tface);

SkTypeface::Style style = tface->style();

« no previous file with comments | « src/ports/SkFontMgr_android.cpp ('k') | src/utils/SkLua.cpp » ('j') | no next file with comments »