return pictures as sk_sp

tools/VisualBench/VisualBenchmarkStream.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.
  *
  */
 
 #include <VisualBench/VisualBenchmarkStream.h>
 #include <VisualBench/WrappedBenchmark.h>
@@ skipping 86 matching lines @@
        fGMs = nullptr;
        fBenches = nullptr;
     }
 
     // seed with an initial benchmark
     // NOTE the initial benchmark will not have preTimingHooks called, but that is okay because
     // it is the warmupbench
     this->next();
 }
 
-bool VisualBenchmarkStream::ReadPicture(const char* path, SkAutoTUnref<SkPicture>* pic) {
+sk_sp<SkPicture> VisualBenchmarkStream::ReadPicture(const char path[]) {
     // Not strictly necessary, as it will be checked again later,
     // but helps to avoid a lot of pointless work if we're going to skip it.
     if (SkCommandLineFlags::ShouldSkip(FLAGS_match, path)) {
-        return false;
+        return nullptr;
     }
 
     SkAutoTDelete<SkStream> stream(SkStream::NewFromFile(path));
     if (stream.get() == nullptr) {
         SkDebugf("Could not read %s.\n", path);
-        return false;
+        return nullptr;
     }
 
-    pic->reset(SkPicture::CreateFromStream(stream.get()));
-    if (pic->get() == nullptr) {
+    auto pic = SkPicture::MakeFromStream(stream.get());
+    if (!pic) {
         SkDebugf("Could not read %s as an SkPicture.\n", path);
-        return false;
     }
-    return true;
+    return pic;
 }
 
 Benchmark* VisualBenchmarkStream::next() {
     Benchmark* bench;
     if (FLAGS_warmup && !fIsWarmedUp) {
         fIsWarmedUp = true;
         bench = new WarmupBench;
     } else {
         // skips non matching benches
         while ((bench = this->innerNext()) &&
@@ skipping 32 matching lines @@
         if (gm->runAsBench()) {
             fSourceType = "gm";
             fBenchType  = "micro";
             return new GMBench(gm.release());
         }
     }
 
     // Render skps
     while (fCurrentSKP < fSKPs.count()) {
         const SkString& path = fSKPs[fCurrentSKP++];
-        SkAutoTUnref<SkPicture> pic;
-        if (!ReadPicture(path.c_str(), &pic)) {
+        sk_sp<SkPicture> pic = ReadPicture(path.c_str());
+        if (!pic) {
             continue;
         }
 
         SkString name = SkOSPath::Basename(path.c_str());
         fSourceType = "skp";
         fBenchType = "playback";
         return new VisualSKPBench(name.c_str(), pic.get());
     }
 
     return nullptr;
 }