From 6296da736fbf40aae881650c239420f64e576c3f Mon Sep 17 00:00:00 2001 From: bungeman Date: Wed, 11 May 2016 12:38:18 -0700 Subject: Move SkTypeface to sk_sp. Review-Url: https://codereview.chromium.org/1933393002 --- gm/typeface.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'gm/typeface.cpp') diff --git a/gm/typeface.cpp b/gm/typeface.cpp index d88efa51bf..e77d27747f 100644 --- a/gm/typeface.cpp +++ b/gm/typeface.cpp @@ -90,7 +90,7 @@ static const struct { static const int gFaceStylesCount = SK_ARRAY_COUNT(gFaceStyles); class TypefaceStylesGM : public skiagm::GM { - SkTypeface* fFaces[gFaceStylesCount]; + sk_sp fFaces[gFaceStylesCount]; bool fApplyKerning; public: @@ -99,16 +99,10 @@ public: memset(fFaces, 0, sizeof(fFaces)); } - virtual ~TypefaceStylesGM() { - for (int i = 0; i < gFaceStylesCount; i++) { - SkSafeUnref(fFaces[i]); - } - } - protected: void onOnceBeforeDraw() override { for (int i = 0; i < gFaceStylesCount; i++) { - fFaces[i] = SkTypeface::CreateFromName( + fFaces[i] = SkTypeface::MakeFromName( sk_tool_utils::platform_font_name(gFaceStyles[i].fName), gFaceStyles[i].fStyle); } } -- cgit v1.2.3