From ca2622ba051829fed5f30facd74c5b41cd4b931c Mon Sep 17 00:00:00 2001 From: reed Date: Fri, 18 Mar 2016 07:25:55 -0700 Subject: return pictures as sk_sp BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1811703002 Review URL: https://codereview.chromium.org/1811703002 --- samplecode/SampleArc.cpp | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) (limited to 'samplecode/SampleArc.cpp') diff --git a/samplecode/SampleArc.cpp b/samplecode/SampleArc.cpp index 3b5288dd08..f95833e830 100644 --- a/samplecode/SampleArc.cpp +++ b/samplecode/SampleArc.cpp @@ -81,8 +81,8 @@ class ArcsView : public SampleView { public: SkRect fRect; - MyDrawable* fAnimatingDrawable; - SkDrawable* fRootDrawable; + sk_sp fAnimatingDrawable; + sk_sp fRootDrawable; ArcsView() { testparse(); @@ -91,16 +91,11 @@ public: fRect.set(0, 0, SkIntToScalar(200), SkIntToScalar(200)); fRect.offset(SkIntToScalar(20), SkIntToScalar(20)); - fAnimatingDrawable = new MyDrawable(fRect); + fAnimatingDrawable = sk_make_sp(fRect); SkPictureRecorder recorder; this->drawRoot(recorder.beginRecording(SkRect::MakeWH(800, 500))); - fRootDrawable = recorder.endRecordingAsDrawable(); - } - - ~ArcsView() override { - fAnimatingDrawable->unref(); - fRootDrawable->unref(); + fRootDrawable = recorder.finishRecordingAsDrawable(); } protected: @@ -186,13 +181,13 @@ protected: DrawRectWithLines(canvas, fRect, paint); - canvas->drawDrawable(fAnimatingDrawable); + canvas->drawDrawable(fAnimatingDrawable.get()); DrawArcs(canvas); } void onDrawContent(SkCanvas* canvas) override { - canvas->drawDrawable(fRootDrawable); + canvas->drawDrawable(fRootDrawable.get()); } bool onAnimate(const SkAnimTimer& timer) override { -- cgit v1.2.3