return pictures as sk_sp

tests/SkpSkGrTest.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrContext.h"
 #include "GrContextFactory.h"
 #include "GrRenderTarget.h"
@@ skipping 360 matching lines @@
 static void writePict(const SkBitmap& bitmap, const char* outDir, const char* pngName) {
     SkString outFile = make_filepath(0, outDir, pngName);
     if (!SkImageEncoder::EncodeFile(outFile.c_str(), bitmap,
             SkImageEncoder::kPNG_Type, 100)) {
         SkDebugf("unable to encode gr %s (width=%d height=%d)br \n", pngName,
                     bitmap.width(), bitmap.height());
     }
 }
 
 void TestResult::testOne() {
-    SkPicture* pic = nullptr;
+    sk_sp<SkPicture> pic;
     {
         SkString d;
         d.printf("    {%d, \"%s\"},", fDirNo, fFilename);
         SkString path = make_filepath(fDirNo, IN_DIR, fFilename);
         SkFILEStream stream(path.c_str());
         if (!stream.isValid()) {
             SkDebugf("invalid stream %s\n", path.c_str());
             goto finish;
         }
         if (fTestStep == kEncodeFiles) {
             size_t length = stream.getLength();
             SkTArray<char, true> bytes;
             bytes.push_back_n(length);
             stream.read(&bytes[0], length);
             stream.rewind();
             SkString wPath = make_filepath(0, outSkpDir, fFilename);
             SkFILEWStream wStream(wPath.c_str());
             wStream.write(&bytes[0], length);
             wStream.flush();
         }
-        pic = SkPicture::CreateFromStream(&stream);
+        pic = SkPicture::MakeFromStream(&stream);
         if (!pic) {
             SkDebugf("unable to decode %s\n", fFilename);
             goto finish;
         }
         int pWidth = pic->width();
         int pHeight = pic->height();
         int pLargerWH = SkTMax(pWidth, pHeight);
         GrContextFactory contextFactory;
 #ifdef SK_BUILD_FOR_WIN
         GrContext* context = contextFactory.get(kAngle);
@@ skipping 16 matching lines @@
             dim.fY = (pHeight + scale - 1) / scale;
             bool success = bitmap.allocN32Pixels(dim.fX, dim.fY);
             if (success) {
                 break;
             }
             SkDebugf("-%d-", scale);
         } while ((scale *= 2) < 256);
         if (scale >= 256) {
             SkDebugf("unable to allocate bitmap for %s (w=%d h=%d) (sw=%d sh=%d)\n",
                     fFilename, pWidth, pHeight, dim.fX, dim.fY);
-            goto finish;
+            return;
         }
         SkCanvas skCanvas(bitmap);
         drawPict(pic, &skCanvas, fScaleOversized ? scale : 1);
         GrTextureDesc desc;
         desc.fConfig = kSkia8888_GrPixelConfig;
         desc.fFlags = kRenderTarget_GrTextureFlagBit;
         desc.fWidth = dim.fX;
         desc.fHeight = dim.fY;
         desc.fSampleCnt = 0;
         SkAutoTUnref<GrTexture> texture(context->createUncachedTexture(desc, nullptr, 0));
         if (!texture) {
             SkDebugf("unable to allocate texture for %s (w=%d h=%d)\n", fFilename,
                 dim.fX, dim.fY);
-            goto finish;
+            return;
         }
         SkGpuDevice grDevice(context, texture.get());
         SkCanvas grCanvas(&grDevice);
-        drawPict(pic, &grCanvas, fScaleOversized ? scale : 1);
+        drawPict(pic.get(), &grCanvas, fScaleOversized ? scale : 1);
 
         SkBitmap grBitmap;
         grBitmap.allocPixels(grCanvas.imageInfo());
         grCanvas.readPixels(&grBitmap, 0, 0);
 
         if (fTestStep == kCompareBits) {
             fPixelError = similarBits(grBitmap, bitmap);
             int skTime = timePict(pic, &skCanvas);
             int grTime = timePict(pic, &grCanvas);
             fTime = skTime - grTime;
         } else if (fTestStep == kEncodeFiles) {
             SkString pngStr = make_png_name(fFilename);
             const char* pngName = pngStr.c_str();
             writePict(grBitmap, outGrDir, pngName);
             writePict(bitmap, outSkDir, pngName);
         }
     }
-finish:
-    delete pic;
 }
 
 static SkString makeStatusString(int dirNo) {
     SkString statName;
     statName.printf("stats%d.txt", dirNo);
     SkString statusFile = make_filepath(0, outStatusDir, statName.c_str());
     return statusFile;
 }
 
 class PreParser {
@@ skipping 260 matching lines @@
     int testIndex = 166;
     int dirIndex = skipOverSkGr[testIndex - 166].directory;
     SkString pictDir = make_in_dir_name(dirIndex);
     if (pictDir.size() == 0) {
         return;
     }
     SkString filename(skipOverSkGr[testIndex - 166].filename);
     TestResult::Test(dirIndex, filename.c_str(), kCompareBits, reporter->verbose());
     TestResult::Test(dirIndex, filename.c_str(), kEncodeFiles, reporter->verbose());
 }