gm/textblob.cpp - Issue 1933393002: Move SkTypeface to sk_sp. - Code Review

Chromium Code Reviews

chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out

(1303)

My Issues | Starred Open | Closed | All

Unified Diff: gm/textblob.cpp

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

Patch Set: Address comments. 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:

View side-by-side diff with in-line comments

« gm/pdf_never_embed.cpp ('K') | « gm/poly2poly.cpp ('k') | gm/textblobmixedsizes.cpp » ('j') | gm/textblobmixedsizes.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: gm/textblob.cpp

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

index 02f3c878a370614f6c494eb27c5f1520e7f958ef..525cfd292d009cb63dedf6af24afbb155886d389 100644

--- a/gm/textblob.cpp

+++ b/gm/textblob.cpp

@@ -72,7 +72,7 @@ public:

protected:

void onOnceBeforeDraw() override {

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

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

SkPaint p;

p.setTypeface(fTypeface);

size_t txtLen = strlen(fText);

@@ -180,9 +180,9 @@ private:

return builder.build();

}

- SkTDArray<uint16_t> fGlyphs;

- SkAutoTUnref<SkTypeface> fTypeface;

- const char* fText;

+ SkTDArray<uint16_t> fGlyphs;

+ sk_sp<SkTypeface> fTypeface;

+ const char* fText;

typedef skiagm::GM INHERITED;

};

« gm/pdf_never_embed.cpp ('K') | « gm/poly2poly.cpp ('k') | gm/textblobmixedsizes.cpp » ('j') | gm/textblobmixedsizes.cpp » ('J')

Powered by Google App Engine

This is Rietveld 408576698