diff options
| author |  bungeman <bungeman@google.com> | 2016-05-12 10:09:30 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-05-12 10:09:31 -0700 |
| commit | 13b9c95295f4c5732e34574789e721a6bc08f7b4 (patch) | |
| tree | c3ef0aa2af9890c03cb79968f32166af39fba9ba /gm/typeface.cpp | |
| parent | 40d21de8b6620d724f34bdc85af1dcb593d33fe0 (diff) | |
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
Diffstat (limited to 'gm/typeface.cpp')
| -rw-r--r-- | gm/typeface.cpp | 10 |
1 files changed, 2 insertions, 8 deletions
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<SkTypeface> 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); } } |