update callsites for Make image factories

gm/imagefromyuvtextures.cpp

 
 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // This test only works with the GPU backend.
 
@@ skipping 72 matching lines @@
                 for (int c = 0; c < 3; ++c) {
                     rgb[c] /= 4;
                 }
                 int uvIndex = j * kBmpSize / 2 + i;
                 uvPixels[0][uvIndex] = static_cast<signed char>(
                     ((-38 * rgb[0] -  74 * rgb[1] + 112 * rgb[2] + 128) >> 8) + 128);
                 uvPixels[1][uvIndex] = static_cast<signed char>(
                     ((112 * rgb[0] -  94 * rgb[1] -  18 * rgb[2] + 128) >> 8) + 128);
             }
         }
-        fRGBImage.reset(SkImage::NewRasterCopy(rgbBmp.info(), rgbColors, rgbBmp.rowBytes()));
+        fRGBImage = SkImage::MakeRasterCopy(SkPixmap(rgbBmp.info(), rgbColors, rgbBmp.rowBytes()));
     }
 
     void createYUVTextures(GrContext* context, GrBackendObject yuvHandles[3]) {
         GrGpu* gpu = context->getGpu();
         if (!gpu) {
             return;
         }
 
         for (int i = 0; i < 3; ++i) {
             SkASSERT(fYUVBmps[i].width() == SkToInt(fYUVBmps[i].rowBytes()));
@@ skipping 30 matching lines @@
         GrBackendObject yuvHandles[3];
         this->createYUVTextures(context, yuvHandles);
 
         static const SkScalar kPad = 10.f;
 
         SkISize sizes[] = {
             { fYUVBmps[0].width(), fYUVBmps[0].height()},
             { fYUVBmps[1].width(), fYUVBmps[1].height()},
             { fYUVBmps[2].width(), fYUVBmps[2].height()},
         };
-        SkTArray<SkImage*> images;
-        images.push_back(SkRef(fRGBImage.get()));
+        SkTArray<sk_sp<SkImage>> images;
+        images.push_back(fRGBImage);
         for (int space = kJPEG_SkYUVColorSpace; space <= kLastEnum_SkYUVColorSpace; ++space) {
-            images.push_back(SkImage::NewFromYUVTexturesCopy(context,
-                                                             static_cast<SkYUVColorSpace>(space),
-                                                             yuvHandles, sizes,
-                                                             kTopLeft_GrSurfaceOrigin));
+            images.push_back(SkImage::MakeFromYUVTexturesCopy(context,
+                                                              static_cast<SkYUVColorSpace>(space),
+                                                              yuvHandles, sizes,
+                                                              kTopLeft_GrSurfaceOrigin));
         }
         this->deleteYUVTextures(context, yuvHandles);
         for (int i = 0; i < images.count(); ++ i) {
             SkScalar y = (i + 1) * kPad + i * fYUVBmps[0].height();
             SkScalar x = kPad;
 
-            canvas->drawImage(images[i], x, y);
-            images[i]->unref();
-            images[i] = nullptr;
+            canvas->drawImage(images[i].get(), x, y);
         }
      }
 
 private:
-    SkAutoTUnref<SkImage>  fRGBImage;
-    SkBitmap               fYUVBmps[3];
+    sk_sp<SkImage>  fRGBImage;
+    SkBitmap        fYUVBmps[3];
 
     static const int kBmpSize = 32;
 
     typedef GM INHERITED;
 };
 
 DEF_GM(return new ImageFromYUVTextures;)
 }
 
 #endif