From 2238c9dbca4b791edc512957728a18ce14d55912 Mon Sep 17 00:00:00 2001 From: robertphillips Date: Wed, 30 Mar 2016 13:34:16 -0700 Subject: Update SkMergeImageFilter to sk_sp TBR=reed@google.com GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1847583002 Review URL: https://codereview.chromium.org/1847583002 --- bench/ImageFilterDAGBench.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'bench/ImageFilterDAGBench.cpp') diff --git a/bench/ImageFilterDAGBench.cpp b/bench/ImageFilterDAGBench.cpp index d66d287e18..5fdf95b06d 100644 --- a/bench/ImageFilterDAGBench.cpp +++ b/bench/ImageFilterDAGBench.cpp @@ -11,12 +11,10 @@ #include "SkCanvas.h" #include "SkMergeImageFilter.h" -enum { kNumInputs = 5 }; // Exercise a blur filter connected to 5 inputs of the same merge filter. // This bench shows an improvement in performance once cacheing of re-used // nodes is implemented, since the DAG is no longer flattened to a tree. - class ImageFilterDAGBench : public Benchmark { public: ImageFilterDAGBench() {} @@ -27,21 +25,23 @@ protected: } void onDraw(int loops, SkCanvas* canvas) override { + const SkRect rect = SkRect::Make(SkIRect::MakeWH(400, 400)); + for (int j = 0; j < loops; j++) { - SkAutoTUnref blur(SkBlurImageFilter::Create(20.0f, 20.0f)); - SkImageFilter* inputs[kNumInputs]; + sk_sp blur(SkBlurImageFilter::Create(20.0f, 20.0f)); + sk_sp inputs[kNumInputs]; for (int i = 0; i < kNumInputs; ++i) { - inputs[i] = blur.get(); + inputs[i] = blur; } - SkAutoTUnref merge(SkMergeImageFilter::Create(inputs, kNumInputs)); SkPaint paint; - paint.setImageFilter(merge); - SkRect rect = SkRect::Make(SkIRect::MakeWH(400, 400)); + paint.setImageFilter(SkMergeImageFilter::Make(inputs, kNumInputs)); canvas->drawRect(rect, paint); } } private: + static const int kNumInputs = 5; + typedef Benchmark INHERITED; }; -- cgit v1.2.3