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

Unified Diff: gm/fontcache.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:
View side-by-side diff with in-line comments
Download patch
Index: gm/fontcache.cpp
diff --git a/gm/fontcache.cpp b/gm/fontcache.cpp
index c4af48930428fde367f21054b702ef3905537f7a..30f8892c78f88c1a93ae71deade77dc8d6f061b5 100644
--- a/gm/fontcache.cpp
+++ b/gm/fontcache.cpp
@@ -20,7 +20,15 @@
class FontCacheGM : public skiagm::GM {
public:
- FontCacheGM() {}
+ FontCacheGM() {
+ fTypefaces[0] = nullptr;
+ fTypefaces[1] = nullptr;
+ }
+
+ virtual ~FontCacheGM() {
+ SkSafeUnref(fTypefaces[0]);
+ SkSafeUnref(fTypefaces[1]);
+ }
protected:
SkString onShortName() override {
@@ -68,7 +76,7 @@
}
private:
- sk_sp<SkTypeface> fTypefaces[2];
+ SkTypeface* fTypefaces[2];
typedef GM INHERITED;
};
« no previous file with comments | « gm/dftext.cpp ('k') | gm/fontmgr.cpp » ('j') | src/ports/SkFontMgr_android.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698