From 5605b56afa5bd89f3148b397318b616fccfd4004 Mon Sep 17 00:00:00 2001 From: robertphillips Date: Tue, 5 Apr 2016 11:50:42 -0700 Subject: Update SkColorFilterImageFilter to sk_sp TBR=reed@google.com GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1858813002 Review URL: https://codereview.chromium.org/1858813002 --- gm/dropshadowimagefilter.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gm/dropshadowimagefilter.cpp') diff --git a/gm/dropshadowimagefilter.cpp b/gm/dropshadowimagefilter.cpp index 567ef803b5..11fa9a86fa 100644 --- a/gm/dropshadowimagefilter.cpp +++ b/gm/dropshadowimagefilter.cpp @@ -93,8 +93,9 @@ protected: draw_bitmap, draw_path, draw_paint, draw_text }; - auto cf(SkColorFilter::MakeModeFilter(SK_ColorMAGENTA, SkXfermode::kSrcIn_Mode)); - SkAutoTUnref cfif(SkColorFilterImageFilter::Create(cf.get())); + sk_sp cf(SkColorFilter::MakeModeFilter(SK_ColorMAGENTA, + SkXfermode::kSrcIn_Mode)); + sk_sp cfif(SkColorFilterImageFilter::Make(std::move(cf), nullptr)); SkImageFilter::CropRect cropRect(SkRect::Make(SkIRect::MakeXYWH(10, 10, 44, 44)), SkImageFilter::CropRect::kHasAll_CropEdge); SkImageFilter::CropRect bogusRect(SkRect::Make(SkIRect::MakeXYWH(-100, -100, 10, 10)), @@ -109,7 +110,7 @@ protected: SkDropShadowImageFilter::Create(7.0f, 7.0f, 3.0f, 3.0f, SK_ColorBLUE, SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode), SkDropShadowImageFilter::Create(7.0f, 7.0f, 3.0f, 3.0f, SK_ColorBLUE, - SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode, cfif, nullptr), + SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode, cfif.get(), nullptr), SkDropShadowImageFilter::Create(7.0f, 7.0f, 3.0f, 3.0f, SK_ColorBLUE, SkDropShadowImageFilter::kDrawShadowAndForeground_ShadowMode, nullptr, &cropRect), SkDropShadowImageFilter::Create(7.0f, 7.0f, 3.0f, 3.0f, SK_ColorBLUE, -- cgit v1.2.3