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

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

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

index 525cfd292d009cb63dedf6af24afbb155886d389..02f3c878a370614f6c494eb27c5f1520e7f958ef 100644

--- a/gm/textblob.cpp

+++ b/gm/textblob.cpp

@@ -72,7 +72,7 @@

protected:

void onOnceBeforeDraw() override {

- fTypeface = sk_tool_utils::create_portable_typeface("serif", SkTypeface::kNormal);

+ fTypeface.reset(sk_tool_utils::create_portable_typeface("serif", SkTypeface::kNormal));

SkPaint p;

p.setTypeface(fTypeface);

size_t txtLen = strlen(fText);

@@ -180,9 +180,9 @@

return builder.build();

}

- SkTDArray<uint16_t> fGlyphs;

- sk_sp<SkTypeface> fTypeface;

- const char* fText;

+ SkTDArray<uint16_t> fGlyphs;

+ SkAutoTUnref<SkTypeface> fTypeface;

+ const char* fText;

typedef skiagm::GM INHERITED;

};