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/tablecolorfilter.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'gm/tablecolorfilter.cpp') diff --git a/gm/tablecolorfilter.cpp b/gm/tablecolorfilter.cpp index a644bd1053..26a3c2c4f1 100644 --- a/gm/tablecolorfilter.cpp +++ b/gm/tablecolorfilter.cpp @@ -163,19 +163,19 @@ protected: paint.setColorFilter(nullptr); for (unsigned i = 0; i < SK_ARRAY_COUNT(gColorFilterMakers); ++i) { - auto colorFilter1(gColorFilterMakers[i]()); - SkAutoTUnref imageFilter1(SkColorFilterImageFilter::Create( - colorFilter1.get(), nullptr, nullptr)); + sk_sp colorFilter1(gColorFilterMakers[i]()); + sk_sp imageFilter1(SkColorFilterImageFilter::Make( + std::move(colorFilter1), nullptr)); // Move down to the next line and draw it // each draw being at xOffset of the previous one y += yOffset; x = 0; for (unsigned j = 1; j < SK_ARRAY_COUNT(gColorFilterMakers); ++j) { - auto colorFilter2(gColorFilterMakers[j]()); - SkAutoTUnref imageFilter2(SkColorFilterImageFilter::Create( - colorFilter2.get(), imageFilter1, nullptr)); - paint.setImageFilter(imageFilter2); + sk_sp colorFilter2(gColorFilterMakers[j]()); + sk_sp imageFilter2(SkColorFilterImageFilter::Make( + std::move(colorFilter2), imageFilter1, nullptr)); + paint.setImageFilter(std::move(imageFilter2)); canvas->drawBitmap(bm, x, y, &paint); x += xOffset; } -- cgit v1.2.3