update callsites for Make image factories

bench/PDFBench.cpp

 /*
  * Copyright 2016 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "Benchmark.h"
 #include "Resources.h"
 #include "SkAutoPixmapStorage.h"
@@ skipping 31 matching lines @@
 public:
     PDFImageBench() {}
     virtual ~PDFImageBench() {}
 
 protected:
     const char* onGetName() override { return "PDFImage"; }
     bool isSuitableFor(Backend backend) override {
         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);
             }
         }
     }
     void onDraw(int loops, SkCanvas*) override {
         if (!fImage) {
             return;
         }
         while (loops-- > 0) {
             SkAutoTUnref<SkPDFObject> object(
-                    SkPDFCreateBitmapObject(fImage, nullptr));
+                    SkPDFCreateBitmapObject(fImage.get(), nullptr));
             SkASSERT(object);
             if (!object) {
                 return;
             }
             test_pdf_object_serialization(object);
         }
     }
 
 private:
-    SkAutoTUnref<SkImage> fImage;
+    sk_sp<SkImage> fImage;
 };
 
 class PDFJpegImageBench : public Benchmark {
 public:
     PDFJpegImageBench() {}
     virtual ~PDFJpegImageBench() {}
 
 protected:
     const char* onGetName() override { return "PDFJpegImage"; }
     bool isSuitableFor(Backend backend) override {
         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) {
             SkDEBUGFAIL("");
             return;
         }
         while (loops-- > 0) {
             SkAutoTUnref<SkPDFObject> object(
-                    SkPDFCreateBitmapObject(fImage, nullptr));
+                    SkPDFCreateBitmapObject(fImage.get(), nullptr));
             SkASSERT(object);
             if (!object) {
                 return;
             }
             test_pdf_object_serialization(object);
         }
     }
 
 private:
-    SkAutoTUnref<SkImage> fImage;
+    sk_sp<SkImage> fImage;
 };
 
 /** Test calling DEFLATE on a 78k PDF command stream. Used for measuring
     alternate zlib settings, usage, and library versions. */
 class PDFCompressionBench : public Benchmark {
 public:
     PDFCompressionBench() {}
     virtual ~PDFCompressionBench() {}
 
 protected:
@@ skipping 33 matching lines @@
             (void)SkPDFUtils::FloatToDecimal(f, dst);
         }
     }
 };
 
 }  // namespace
 DEF_BENCH(return new PDFImageBench;)
 DEF_BENCH(return new PDFJpegImageBench;)
 DEF_BENCH(return new PDFCompressionBench;)
 DEF_BENCH(return new PDFScalarBench;)