update callsites for Make image factories

not forced yet, as we still have the build-guard. waiting on chrome CL

BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1810813003

TBR=

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

6 files changed, 25 insertions, 29 deletions

diff --git a/bench/DisplacementBench.cpp b/bench/DisplacementBench.cpp
index f3f9472061..c22b8fd2d1 100644
--- a/bench/DisplacementBench.cpp
+++ b/bench/DisplacementBench.cpp
@@ -67,7 +67,7 @@ protected:
             }
         }
 
-        fCheckerboard.reset(surface->newImageSnapshot());
+        fCheckerboard = surface->makeImageSnapshot();
     }
 
     void drawClippedBitmap(SkCanvas* canvas, int x, int y, const SkPaint& paint) {
@@ -82,7 +82,7 @@ protected:
     inline bool isSmall() const { return fIsSmall; }
 
     SkBitmap fBitmap;
-    SkAutoTUnref<SkImage> fCheckerboard;
+    sk_sp<SkImage> fCheckerboard;
 
 private:
     bool fInitialized;
@@ -102,7 +102,7 @@ protected:
 
     void onDraw(int loops, SkCanvas* canvas) override {
         SkPaint paint;
-        SkAutoTUnref<SkImageFilter> displ(SkImageSource::Create(fCheckerboard));
+        SkAutoTUnref<SkImageFilter> displ(SkImageSource::Create(fCheckerboard.get()));
         // No displacement effect
         paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kR_ChannelSelectorType,
@@ -129,7 +129,7 @@ protected:
 
     void onDraw(int loops, SkCanvas* canvas) override {
         SkPaint paint;
-        SkAutoTUnref<SkImageFilter> displ(SkImageSource::Create(fCheckerboard));
+        SkAutoTUnref<SkImageFilter> displ(SkImageSource::Create(fCheckerboard.get()));
         // Displacement, with 1 alpha component (which isn't pre-multiplied)
         paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kB_ChannelSelectorType,
@@ -155,7 +155,7 @@ protected:
 
     void onDraw(int loops, SkCanvas* canvas) override {
         SkPaint paint;
-        SkAutoTUnref<SkImageFilter> displ(SkImageSource::Create(fCheckerboard));
+        SkAutoTUnref<SkImageFilter> displ(SkImageSource::Create(fCheckerboard.get()));
         // Displacement, with 2 non-alpha components
         paint.setImageFilter(SkDisplacementMapEffect::Create(
             SkDisplacementMapEffect::kR_ChannelSelectorType,
diff --git a/bench/ImageBench.cpp b/bench/ImageBench.cpp
index 097ed91d5d..b07d267b60 100644
--- a/bench/ImageBench.cpp
+++ b/bench/ImageBench.cpp
@@ -33,7 +33,7 @@ protected:
         SkImageInfo info = SkImageInfo::MakeN32Premul(100, 100);
         SkAutoTUnref<SkSurface> surface(canvas->newSurface(info));
         canvas->drawColor(SK_ColorRED);
-        fImage.reset(surface->newImageSnapshot());
+        fImage = surface->makeImageSnapshot();
 
         // create a cpu-backed Surface
         fRasterSurface.reset(SkSurface::NewRaster(info));
@@ -49,14 +49,14 @@ protected:
     void onDraw(int loops, SkCanvas*) override {
         for (int i = 0; i < loops; i++) {
             for (int inner = 0; inner < 10; ++inner) {
-                fRasterSurface->getCanvas()->drawImage(fImage, 0, 0);
+                fRasterSurface->getCanvas()->drawImage(fImage.get(), 0, 0);
             }
         }
     }
 
 private:
     SkString                fName;
-    SkAutoTUnref<SkImage>   fImage;
+    sk_sp<SkImage>   fImage;
     SkAutoTUnref<SkSurface> fRasterSurface;
 
     typedef Benchmark INHERITED;
diff --git a/bench/MergeBench.cpp b/bench/MergeBench.cpp
index 925b6b2bfe..b24f988ded 100644
--- a/bench/MergeBench.cpp
+++ b/bench/MergeBench.cpp
@@ -45,8 +45,8 @@ protected:
 
 private:
     SkImageFilter* mergeBitmaps() {
-        SkAutoTUnref<SkImageFilter> first(SkImageSource::Create(fCheckerboard));
-        SkAutoTUnref<SkImageFilter> second(SkImageSource::Create(fImage));
+        SkAutoTUnref<SkImageFilter> first(SkImageSource::Create(fCheckerboard.get()));
+        SkAutoTUnref<SkImageFilter> second(SkImageSource::Create(fImage.get()));
         return SkMergeImageFilter::Create(first, second);
     }
 
@@ -59,7 +59,7 @@ private:
         paint.setTextSize(SkIntToScalar(96));
         const char* str = "g";
         surface->getCanvas()->drawText(str, strlen(str), 15, 55, paint);
-        fImage.reset(surface->newImageSnapshot());
+        fImage = surface->makeImageSnapshot();
     }
 
     void make_checkerboard() {
@@ -82,12 +82,12 @@ private:
             }
         }
 
-        fCheckerboard.reset(surface->newImageSnapshot());
+        fCheckerboard = surface->makeImageSnapshot();
     }
 
     bool fIsSmall;
     bool fInitialized;
-    SkAutoTUnref<SkImage> fImage, fCheckerboard;
+    sk_sp<SkImage> fImage, fCheckerboard;
 
     typedef Benchmark INHERITED;
 };
diff --git a/bench/PDFBench.cpp b/bench/PDFBench.cpp
index ba25e44f37..920a02da4a 100644
--- a/bench/PDFBench.cpp
+++ b/bench/PDFBench.cpp
@@ -49,15 +49,13 @@ protected:
         return backend == kNonRendering_Backend;
     }
     void onDelayedSetup() override {
-        SkAutoTUnref<SkImage> img(GetResourceAsImage("color_wheel.png"));
+        sk_sp<SkImage> img(GetResourceAsImage("color_wheel.png"));
         if (img) {
             // force decoding, throw away reference to encoded data.
             SkAutoPixmapStorage pixmap;
             pixmap.alloc(SkImageInfo::MakeN32Premul(img->dimensions()));
             if (img->readPixels(pixmap, 0, 0)) {
-                fImage.reset(SkImage::NewRasterCopy(
-                                     pixmap.info(), pixmap.addr(),
-                                     pixmap.rowBytes(), pixmap.ctable()));
+                fImage = SkImage::MakeRasterCopy(pixmap);
             }
         }
     }
@@ -67,7 +65,7 @@ protected:
         }
         while (loops-- > 0) {
             SkAutoTUnref<SkPDFObject> object(
-                    SkPDFCreateBitmapObject(fImage, nullptr));
+                    SkPDFCreateBitmapObject(fImage.get(), nullptr));
             SkASSERT(object);
             if (!object) {
                 return;
@@ -77,7 +75,7 @@ protected:
     }
 
 private:
-    SkAutoTUnref<SkImage> fImage;
+    sk_sp<SkImage> fImage;
 };
 
 class PDFJpegImageBench : public Benchmark {
@@ -91,13 +89,12 @@ protected:
         return backend == kNonRendering_Backend;
     }
     void onDelayedSetup() override {
-        SkAutoTUnref<SkImage> img(
-                GetResourceAsImage("mandrill_512_q075.jpg"));
+        sk_sp<SkImage> img(GetResourceAsImage("mandrill_512_q075.jpg"));
         if (!img) { return; }
         SkAutoTUnref<SkData> encoded(img->refEncoded());
         SkASSERT(encoded);
         if (!encoded) { return; }
-        fImage.reset(img.release());
+        fImage = img;
     }
     void onDraw(int loops, SkCanvas*) override {
         if (!fImage) {
@@ -106,7 +103,7 @@ protected:
         }
         while (loops-- > 0) {
             SkAutoTUnref<SkPDFObject> object(
-                    SkPDFCreateBitmapObject(fImage, nullptr));
+                    SkPDFCreateBitmapObject(fImage.get(), nullptr));
             SkASSERT(object);
             if (!object) {
                 return;
@@ -116,7 +113,7 @@ protected:
     }
 
 private:
-    SkAutoTUnref<SkImage> fImage;
+    sk_sp<SkImage> fImage;
 };
 
 /** Test calling DEFLATE on a 78k PDF command stream. Used for measuring
diff --git a/bench/SKPBench.cpp b/bench/SKPBench.cpp
index b4724195df..1d378b5046 100644
--- a/bench/SKPBench.cpp
+++ b/bench/SKPBench.cpp
@@ -90,7 +90,7 @@ void SKPBench::onPerCanvasPostDraw(SkCanvas* canvas) {
     // Draw the last set of tiles into the master canvas in case we're
     // saving the images
     for (int i = 0; i < fTileRects.count(); ++i) {
-        SkAutoTUnref<SkImage> image(fSurfaces[i]->newImageSnapshot());
+        sk_sp<SkImage> image(fSurfaces[i]->makeImageSnapshot());
         canvas->drawImage(image,
                           SkIntToScalar(fTileRects[i].fLeft), SkIntToScalar(fTileRects[i].fTop));
         SkSafeSetNull(fSurfaces[i]);
diff --git a/bench/SkLinearBitmapPipelineBench.cpp b/bench/SkLinearBitmapPipelineBench.cpp
index 0c60eed302..7d2d4a54dd 100644
--- a/bench/SkLinearBitmapPipelineBench.cpp
+++ b/bench/SkLinearBitmapPipelineBench.cpp
@@ -173,9 +173,8 @@ struct SkBitmapFPOrigShader : public CommonBitmapFPBenchmark {
     void onPreDraw(SkCanvas* c) override {
         CommonBitmapFPBenchmark::onPreDraw(c);
 
-        SkImage* image = SkImage::NewRasterCopy(
-            fInfo, fBitmap.get(), sizeof(SkPMColor) * fSrcSize.fWidth);
-        fImage.reset(image);
+        fImage = SkImage::MakeRasterCopy(
+            SkPixmap(fInfo, fBitmap.get(), sizeof(SkPMColor) * fSrcSize.fWidth));
         fPaint.setShader(fImage->makeShader(fXTile, fYTile));
         if (fUseBilerp) {
             fPaint.setFilterQuality(SkFilterQuality::kLow_SkFilterQuality);
@@ -209,7 +208,7 @@ struct SkBitmapFPOrigShader : public CommonBitmapFPBenchmark {
         ctx->~Context();
     }
     SkPaint fPaint;
-    SkAutoTUnref<SkImage> fImage;
+    sk_sp<SkImage> fImage;
 };
 
 static SkISize srcSize = SkISize::Make(120, 100);