update callsites for Make image factories

src/pdf/SkPDFDevice.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPDFDevice.h"
 
 #include "SkAnnotationKeys.h"
@@ skipping 1142 matching lines @@
             }
             // recompute dst, based on the smaller tmpSrc
             matrix.mapRect(&tmpDst, tmpSrc);
         }
 
         // since we may need to clamp to the borders of the src rect within
         // the bitmap, we extract a subset.
         SkIRect srcIR;
         tmpSrc.roundOut(&srcIR);
 
-        autoImageUnref.reset(image->newSubset(srcIR));
+        autoImageUnref = image->makeSubset(srcIR);
         if (!autoImageUnref) {
             return;
         }
         image = autoImageUnref.get();
         // Since we did an extract, we need to adjust the matrix accordingly
         SkScalar dx = 0, dy = 0;
         if (srcIR.fLeft > 0) {
             dx = SkIntToScalar(srcIR.fLeft);
         }
         if (srcIR.fTop > 0) {
@@ skipping 1006 matching lines @@
             SkImageInfo::MakeN32Premul(image->dimensions())));
     if (!surface) {
         return image;
     }
     SkCanvas* canvas = surface->getCanvas();
     canvas->clear(SK_ColorTRANSPARENT);
     SkPaint paint;
     paint.setColorFilter(colorFilter);
     canvas->drawImage(image, 0, 0, &paint);
     canvas->flush();
-    return surface->newImageSnapshot();
+    return surface->makeImageSnapshot().release();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 void SkPDFDevice::internalDrawImage(const SkMatrix& origMatrix,
                                     const SkClipStack* clipStack,
                                     const SkRegion& origClipRegion,
                                     const SkImage* image,
                                     const SkIRect* srcRect,
                                     const SkPaint& paint) {
     SkASSERT(image);
     #ifdef SK_PDF_IMAGE_STATS
     gDrawImageCalls.fetch_add(1);
     #endif
     SkMatrix matrix = origMatrix;
     SkRegion perspectiveBounds;
     const SkRegion* clipRegion = &origClipRegion;
     sk_sp<const SkImage> autoImageUnref;
 
     if (srcRect) {
-        autoImageUnref.reset(image->newSubset(*srcRect));
+        autoImageUnref = image->makeSubset(*srcRect);
         if (!autoImageUnref) {
             return;
         }
         image = autoImageUnref.get();
     }
     // Rasterize the bitmap using perspective in a new bitmap.
     if (origMatrix.hasPerspective()) {
         if (fRasterDpi == 0) {
             return;
         }
@@ skipping 58 matching lines @@
 
         // In the new space, we use the identity matrix translated
         // and scaled to reflect DPI.
         matrix.setScale(1 / scaleX, 1 / scaleY);
         matrix.postTranslate(deltaX, deltaY);
 
         perspectiveBounds.setRect(bounds.roundOut());
         clipRegion = &perspectiveBounds;
         srcRect = nullptr;
 
-        autoImageUnref.reset(surface->newImageSnapshot());
+        autoImageUnref.reset(surface->makeImageSnapshot().release());
         image = autoImageUnref.get();
     }
 
     SkMatrix scaled;
     // Adjust for origin flip.
     scaled.setScale(SK_Scalar1, -SK_Scalar1);
     scaled.postTranslate(0, SK_Scalar1);
     // Scale the image up from 1x1 to WxH.
     SkIRect subset = image->bounds();
     scaled.postScale(SkIntToScalar(image->width()),
@@ skipping 29 matching lines @@
         pdfimage.reset(SkPDFCreateBitmapObject(
                                image, fCanon->getPixelSerializer()));
         if (!pdfimage) {
             return;
         }
         fCanon->addPDFBitmap(image->uniqueID(), pdfimage.get());
     }
     SkPDFUtils::DrawFormXObject(this->addXObjectResource(pdfimage.get()),
                                 &content.entry()->fContent);
 }