From 6e7025ab13dfc4f0037233e67b4b8e18d6dfd1e1 Mon Sep 17 00:00:00 2001 From: robertphillips Date: Mon, 4 Apr 2016 04:31:25 -0700 Subject: Update SkBlurImageFilter to sk_sp TBR=reed@google.com GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1852743002 Review URL: https://codereview.chromium.org/1852743002 --- bench/ImageFilterDAGBench.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'bench/ImageFilterDAGBench.cpp') diff --git a/bench/ImageFilterDAGBench.cpp b/bench/ImageFilterDAGBench.cpp index 5fdf95b06d..308b3b0037 100644 --- a/bench/ImageFilterDAGBench.cpp +++ b/bench/ImageFilterDAGBench.cpp @@ -28,7 +28,7 @@ protected: const SkRect rect = SkRect::Make(SkIRect::MakeWH(400, 400)); for (int j = 0; j < loops; j++) { - sk_sp blur(SkBlurImageFilter::Create(20.0f, 20.0f)); + sk_sp blur(SkBlurImageFilter::Make(20.0f, 20.0f, nullptr)); sk_sp inputs[kNumInputs]; for (int i = 0; i < kNumInputs; ++i) { inputs[i] = blur; @@ -58,14 +58,14 @@ protected: void onDraw(int loops, SkCanvas* canvas) override { for (int j = 0; j < loops; j++) { - SkAutoTUnref blur(SkBlurImageFilter::Create(4.0f, 4.0f)); - SkDisplacementMapEffect::ChannelSelectorType xSelector = SkDisplacementMapEffect::kR_ChannelSelectorType; - SkDisplacementMapEffect::ChannelSelectorType ySelector = SkDisplacementMapEffect::kB_ChannelSelectorType; + sk_sp blur(SkBlurImageFilter::Make(4.0f, 4.0f, nullptr)); + auto xSelector = SkDisplacementMapEffect::kR_ChannelSelectorType; + auto ySelector = SkDisplacementMapEffect::kB_ChannelSelectorType; SkScalar scale = 2; - SkAutoTUnref displ(SkDisplacementMapEffect::Create(xSelector, ySelector, scale, - blur.get(), blur.get())); + sk_sp displ(SkDisplacementMapEffect::Create(xSelector, ySelector, scale, + blur.get(), blur.get())); SkPaint paint; - paint.setImageFilter(displ); + paint.setImageFilter(std::move(displ)); SkRect rect = SkRect::Make(SkIRect::MakeWH(400, 400)); canvas->drawRect(rect, paint); } -- cgit v1.2.3