diff options
author | bungeman <bungeman@google.com> | 2016-05-11 12:38:18 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-05-11 12:38:18 -0700 |
commit | 6296da736fbf40aae881650c239420f64e576c3f (patch) | |
tree | 5121ecf46ff7099d8eb66d2b2a4671d5ad94db89 /gm/colortype.cpp | |
parent | c8699321b924c1f284df93cb29b86000c1d73c0a (diff) |
Move SkTypeface to sk_sp.
Review-Url: https://codereview.chromium.org/1933393002
Diffstat (limited to 'gm/colortype.cpp')
-rw-r--r-- | gm/colortype.cpp | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/gm/colortype.cpp b/gm/colortype.cpp index c9314de2a4..68dfeee535 100644 --- a/gm/colortype.cpp +++ b/gm/colortype.cpp @@ -12,13 +12,7 @@ class ColorTypeGM : public skiagm::GM { public: - ColorTypeGM() - : fColorType(nullptr) { - } - - virtual ~ColorTypeGM() { - SkSafeUnref(fColorType); - } + ColorTypeGM() {} protected: void onOnceBeforeDraw() override { @@ -33,12 +27,11 @@ protected: paint.setShader(SkGradientShader::MakeSweep(0, 0, colors, nullptr, SK_ARRAY_COUNT(colors), 0, &local)); - SkTypeface* orig = sk_tool_utils::create_portable_typeface("serif", SkTypeface::kBold); + sk_sp<SkTypeface> orig(sk_tool_utils::create_portable_typeface("serif", SkTypeface::kBold)); if (nullptr == orig) { - orig = SkTypeface::RefDefault(); + orig = SkTypeface::MakeDefault(); } - fColorType = new SkGTypeface(orig, paint); - orig->unref(); + fColorType = sk_make_sp<SkGTypeface>(std::move(orig), paint); } SkString onShortName() override { @@ -62,7 +55,7 @@ protected: } private: - SkTypeface* fColorType; + sk_sp<SkTypeface> fColorType; typedef skiagm::GM INHERITED; }; |