diff options
| author |  robertphillips <robertphillips@google.com> | 2016-04-06 08:40:59 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-04-06 08:40:59 -0700 |
| commit | c416912da4840af0c49bd8cdcf00044ed39500f6 (patch) | |
| tree | 2da9d5261c5a85c660a0fea0beae63f5dd7e83b4 /gm/imagefilterstransformed.cpp | |
| parent | 885b677b10b88ba1eebecd1c2795702b88f63d39 (diff) | |
Update DropShadowImageFilter to sk_sp
TBR=reed@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1861843002
Review URL: https://codereview.chromium.org/1861843002
Diffstat (limited to 'gm/imagefilterstransformed.cpp')
| -rw-r--r-- | gm/imagefilterstransformed.cpp | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/gm/imagefilterstransformed.cpp b/gm/imagefilterstransformed.cpp index 1ab52b9f58..291d1d46ec 100644 --- a/gm/imagefilterstransformed.cpp +++ b/gm/imagefilterstransformed.cpp @@ -65,17 +65,18 @@ protected: void onDraw(SkCanvas* canvas) override { sk_sp<SkImageFilter> gradient(SkImageSource::Make(fGradientCircle)); sk_sp<SkImageFilter> checkerboard(SkImageSource::Make(fCheckerboard)); - SkImageFilter* filters[] = { - SkBlurImageFilter::Make(12, 0, nullptr).release(), - SkDropShadowImageFilter::Create(0, 15, 8, 0, SK_ColorGREEN, - SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode), - SkDisplacementMapEffect::Create(SkDisplacementMapEffect::kR_ChannelSelectorType, + sk_sp<SkImageFilter> filters[] = { + SkBlurImageFilter::Make(12, 0, nullptr), + SkDropShadowImageFilter::Make(0, 15, 8, 0, SK_ColorGREEN, + SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode, nullptr), + sk_sp<SkImageFilter>(SkDisplacementMapEffect::Create( + SkDisplacementMapEffect::kR_ChannelSelectorType, SkDisplacementMapEffect::kR_ChannelSelectorType, 12, gradient.get(), - checkerboard.get()), - SkDilateImageFilter::Make(2, 2, checkerboard).release(), - SkErodeImageFilter::Make(2, 2, checkerboard).release(), + checkerboard.get())), + SkDilateImageFilter::Make(2, 2, checkerboard), + SkErodeImageFilter::Make(2, 2, checkerboard), }; const SkScalar margin = SkIntToScalar(20); @@ -106,10 +107,6 @@ protected: canvas->restore(); canvas->translate(0, size + margin); } - - for (size_t i = 0; i < SK_ARRAY_COUNT(filters); ++i) { - SkSafeUnref(filters[i]); - } } private: |