Revert of Update DisplacementMapEffect to sk_sp (patchset #3 id:40001 of https://codereview.chromium.org/1877783003/ )

Reason for revert:
unexpected image diffs in imagefilterscropexpand GM

Original issue's description:
> Update DisplacementMapEffect to sk_sp
>
> TBR=reed@google.com
>
> GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1877783003
>
> Committed: https://skia.googlesource.com/skia/+/a53011ef44705a091a8e24f7ea289a3f9ad759f2

TBR=fmalita@chromium.org,reed@google.com
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true

Review URL: https://codereview.chromium.org/1884253004

1 files changed, 77 insertions, 77 deletions

diff --git a/gm/displacement.cpp b/gm/displacement.cpp
index 9fea0188df..9b62a60ab3 100644
--- a/gm/displacement.cpp
+++ b/gm/displacement.cpp
@@ -58,142 +58,142 @@ protected:
         canvas->clear(SK_ColorBLACK);
         SkPaint paint;
         sk_sp<SkImageFilter> displ(SkImageSource::Make(fCheckerboard));
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kR_ChannelSelectorType,
-            SkDisplacementMapEffect::kG_ChannelSelectorType, 0.0f, displ, nullptr));
-        this->drawClippedBitmap(canvas, 0, 0, paint);
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+            SkDisplacementMapEffect::kG_ChannelSelectorType, 0.0f, displ.get()))->unref();
+        drawClippedBitmap(canvas, 0, 0, paint);
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kB_ChannelSelectorType,
-            SkDisplacementMapEffect::kA_ChannelSelectorType, 16.0f, displ, nullptr));
-        this->drawClippedBitmap(canvas, 100, 0, paint);
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+            SkDisplacementMapEffect::kA_ChannelSelectorType, 16.0f, displ.get()))->unref();
+        drawClippedBitmap(canvas, 100, 0, paint);
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kR_ChannelSelectorType,
-            SkDisplacementMapEffect::kB_ChannelSelectorType, 32.0f, displ, nullptr));
-        this->drawClippedBitmap(canvas, 200, 0, paint);
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+            SkDisplacementMapEffect::kB_ChannelSelectorType, 32.0f, displ.get()))->unref();
+        drawClippedBitmap(canvas, 200, 0, paint);
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kG_ChannelSelectorType,
-            SkDisplacementMapEffect::kA_ChannelSelectorType, 48.0f, displ, nullptr));
-        this->drawClippedBitmap(canvas, 300, 0, paint);
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+            SkDisplacementMapEffect::kA_ChannelSelectorType, 48.0f, displ.get()))->unref();
+        drawClippedBitmap(canvas, 300, 0, paint);
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kR_ChannelSelectorType,
-            SkDisplacementMapEffect::kA_ChannelSelectorType, 64.0f, displ, nullptr));
-        this->drawClippedBitmap(canvas, 400, 0, paint);
+            SkDisplacementMapEffect::kA_ChannelSelectorType, 64.0f, displ.get()))->unref();
+        drawClippedBitmap(canvas, 400, 0, paint);
 
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kR_ChannelSelectorType,
-            SkDisplacementMapEffect::kG_ChannelSelectorType, 40.0f, displ, nullptr));
-        this->drawClippedBitmap(canvas, 0, 100, paint);
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+            SkDisplacementMapEffect::kG_ChannelSelectorType, 40.0f, displ.get()))->unref();
+        drawClippedBitmap(canvas, 0, 100, paint);
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kB_ChannelSelectorType,
-            SkDisplacementMapEffect::kA_ChannelSelectorType, 40.0f, displ, nullptr));
-        this->drawClippedBitmap(canvas, 100, 100, paint);
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+            SkDisplacementMapEffect::kA_ChannelSelectorType, 40.0f, displ.get()))->unref();
+        drawClippedBitmap(canvas, 100, 100, paint);
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kR_ChannelSelectorType,
-            SkDisplacementMapEffect::kB_ChannelSelectorType, 40.0f, displ, nullptr));
-        this->drawClippedBitmap(canvas, 200, 100, paint);
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+            SkDisplacementMapEffect::kB_ChannelSelectorType, 40.0f, displ.get()))->unref();
+        drawClippedBitmap(canvas, 200, 100, paint);
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kG_ChannelSelectorType,
-            SkDisplacementMapEffect::kA_ChannelSelectorType, 40.0f, displ, nullptr));
-        this->drawClippedBitmap(canvas, 300, 100, paint);
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+            SkDisplacementMapEffect::kA_ChannelSelectorType, 40.0f, displ.get()))->unref();
+        drawClippedBitmap(canvas, 300, 100, paint);
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kR_ChannelSelectorType,
-            SkDisplacementMapEffect::kA_ChannelSelectorType, 40.0f, displ, nullptr));
-        this->drawClippedBitmap(canvas, 400, 100, paint);
+            SkDisplacementMapEffect::kA_ChannelSelectorType, 40.0f, displ.get()))->unref();
+        drawClippedBitmap(canvas, 400, 100, paint);
 
         SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(30, 30, 40, 40));
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kR_ChannelSelectorType,
             SkDisplacementMapEffect::kG_ChannelSelectorType,
-            0.0f, displ, nullptr, &cropRect));
-        this->drawClippedBitmap(canvas, 0, 200, paint);
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+            0.0f, displ.get(), nullptr, &cropRect))->unref();
+        drawClippedBitmap(canvas, 0, 200, paint);
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kB_ChannelSelectorType,
             SkDisplacementMapEffect::kA_ChannelSelectorType,
-            16.0f, displ, nullptr, &cropRect));
-        this->drawClippedBitmap(canvas, 100, 200, paint);
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+            16.0f, displ.get(), nullptr, &cropRect))->unref();
+        drawClippedBitmap(canvas, 100, 200, paint);
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kR_ChannelSelectorType,
             SkDisplacementMapEffect::kB_ChannelSelectorType,
-            32.0f, displ, nullptr, &cropRect));
-        this->drawClippedBitmap(canvas, 200, 200, paint);
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+            32.0f, displ.get(), nullptr, &cropRect))->unref();
+        drawClippedBitmap(canvas, 200, 200, paint);
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kG_ChannelSelectorType,
             SkDisplacementMapEffect::kA_ChannelSelectorType,
-            48.0f, displ, nullptr, &cropRect));
-        this->drawClippedBitmap(canvas, 300, 200, paint);
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+            48.0f, displ.get(), nullptr, &cropRect))->unref();
+        drawClippedBitmap(canvas, 300, 200, paint);
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kR_ChannelSelectorType,
             SkDisplacementMapEffect::kA_ChannelSelectorType,
-            64.0f, displ, nullptr, &cropRect));
-        this->drawClippedBitmap(canvas, 400, 200, paint);
+            64.0f, displ.get(), nullptr, &cropRect))->unref();
+        drawClippedBitmap(canvas, 400, 200, paint);
 
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kR_ChannelSelectorType,
             SkDisplacementMapEffect::kG_ChannelSelectorType,
-            40.0f, displ, nullptr, &cropRect));
-        this->drawClippedBitmap(canvas, 0, 300, paint);
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+            40.0f, displ.get(), nullptr, &cropRect))->unref();
+        drawClippedBitmap(canvas, 0, 300, paint);
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kB_ChannelSelectorType,
             SkDisplacementMapEffect::kA_ChannelSelectorType,
-            40.0f, displ, nullptr, &cropRect));
-        this->drawClippedBitmap(canvas, 100, 300, paint);
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+            40.0f, displ.get(), nullptr, &cropRect))->unref();
+        drawClippedBitmap(canvas, 100, 300, paint);
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kR_ChannelSelectorType,
             SkDisplacementMapEffect::kB_ChannelSelectorType,
-            40.0f, displ, nullptr, &cropRect));
-        this->drawClippedBitmap(canvas, 200, 300, paint);
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+            40.0f, displ.get(), nullptr, &cropRect))->unref();
+        drawClippedBitmap(canvas, 200, 300, paint);
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kG_ChannelSelectorType,
             SkDisplacementMapEffect::kA_ChannelSelectorType,
-            40.0f, displ, nullptr, &cropRect));
-        this->drawClippedBitmap(canvas, 300, 300, paint);
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+            40.0f, displ.get(), nullptr, &cropRect))->unref();
+        drawClippedBitmap(canvas, 300, 300, paint);
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kR_ChannelSelectorType,
             SkDisplacementMapEffect::kA_ChannelSelectorType,
-            40.0f, displ, nullptr, &cropRect));
-        this->drawClippedBitmap(canvas, 400, 300, paint);
+            40.0f, displ.get(), nullptr, &cropRect))->unref();
+        drawClippedBitmap(canvas, 400, 300, paint);
 
         // Test for negative scale.
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kG_ChannelSelectorType,
             SkDisplacementMapEffect::kA_ChannelSelectorType,
-            -40.0f, displ, nullptr));
+            -40.0f, displ.get()))->unref();
         this->drawClippedBitmap(canvas, 500, 0, paint);
 
         // Tests for images of different sizes
         displ = SkImageSource::Make(fSmall);
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kR_ChannelSelectorType,
             SkDisplacementMapEffect::kG_ChannelSelectorType,
-            40.0f, std::move(displ), nullptr));
-        this->drawClippedBitmap(canvas, 0, 400, paint);
+            40.0f, displ.get()))->unref();
+        drawClippedBitmap(canvas, 0, 400, paint);
         displ = SkImageSource::Make(fLarge);
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kB_ChannelSelectorType,
             SkDisplacementMapEffect::kA_ChannelSelectorType,
-            40.0f, std::move(displ), nullptr));
-        this->drawClippedBitmap(canvas, 100, 400, paint);
+            40.0f, displ.get()))->unref();
+        drawClippedBitmap(canvas, 100, 400, paint);
         displ = SkImageSource::Make(fLargeW);
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kR_ChannelSelectorType,
             SkDisplacementMapEffect::kB_ChannelSelectorType,
-            40.0f, std::move(displ), nullptr));
-        this->drawClippedBitmap(canvas, 200, 400, paint);
+            40.0f, displ.get()))->unref();
+        drawClippedBitmap(canvas, 200, 400, paint);
         displ = SkImageSource::Make(fLargeH);
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kG_ChannelSelectorType,
             SkDisplacementMapEffect::kA_ChannelSelectorType,
-            40.0f, std::move(displ), nullptr));
-        this->drawClippedBitmap(canvas, 300, 400, paint);
+            40.0f, displ.get()))->unref();
+        drawClippedBitmap(canvas, 300, 400, paint);
 
         // Test for no given displacement input. In this case, both displacement
         // and color should use the same bitmap, given to SkCanvas::drawBitmap()
         // as an input argument.
-        paint.setImageFilter(SkDisplacementMapEffect::Make(
+        paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kG_ChannelSelectorType,
             SkDisplacementMapEffect::kA_ChannelSelectorType,
-            40.0f, nullptr, nullptr));
-        this->drawClippedBitmap(canvas, 400, 400, paint);
+            40.0f, nullptr))->unref();
+        drawClippedBitmap(canvas, 400, 400, paint);
     }
 
 private: