From 13b9c95295f4c5732e34574789e721a6bc08f7b4 Mon Sep 17 00:00:00 2001 From: bungeman Date: Thu, 12 May 2016 10:09:30 -0700 Subject: Move SkTypeface to sk_sp. Committed: https://skia.googlesource.com/skia/+/6296da736fbf40aae881650c239420f64e576c3f GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1933393002 Review-Url: https://codereview.chromium.org/1933393002 --- gm/fontcache.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'gm/fontcache.cpp') diff --git a/gm/fontcache.cpp b/gm/fontcache.cpp index 30f8892c78..c4af489304 100644 --- a/gm/fontcache.cpp +++ b/gm/fontcache.cpp @@ -20,15 +20,7 @@ static SkScalar draw_string(SkCanvas* canvas, const SkString& text, SkScalar x, class FontCacheGM : public skiagm::GM { public: - FontCacheGM() { - fTypefaces[0] = nullptr; - fTypefaces[1] = nullptr; - } - - virtual ~FontCacheGM() { - SkSafeUnref(fTypefaces[0]); - SkSafeUnref(fTypefaces[1]); - } + FontCacheGM() {} protected: SkString onShortName() override { @@ -76,7 +68,7 @@ protected: } private: - SkTypeface* fTypefaces[2]; + sk_sp fTypefaces[2]; typedef GM INHERITED; }; -- cgit v1.2.3