SkPDF: draw{Image,Bitmap} always serializes early

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"
 #include "SkData.h"
 #include "SkImage.h"
 #include "SkPDFBitmap.h"
 #include "SkPDFUtils.h"
 #include "SkPixmap.h"
 #include "SkRandom.h"
 
 namespace {
 struct NullWStream : public SkWStream {
     NullWStream() : fN(0) {}
     bool write(const void*, size_t n) override { fN += n; return true; }
     size_t bytesWritten() const override { return fN; }
     size_t fN;
 };
 
-static void test_pdf_object_serialization(SkPDFObject* object) {
+static void test_pdf_object_serialization(const sk_sp<SkPDFObject> object) {
     // SkDebugWStream wStream;
     NullWStream wStream;
     SkPDFSubstituteMap substitutes;
     SkPDFObjNumMap objNumMap;
-    objNumMap.addObjectRecursively(object, substitutes);
+    objNumMap.addObjectRecursively(object.get(), substitutes);
     for (int i = 0; i < objNumMap.objects().count(); ++i) {
         SkPDFObject* object = objNumMap.objects()[i].get();
         wStream.writeDecAsText(i + 1);
         wStream.writeText(" 0 obj\n");
         object->emitObject(&wStream, objNumMap, substitutes);
         wStream.writeText("\nendobj\n");
     }
 }
 
 class PDFImageBench : public Benchmark {
@@ skipping 15 matching lines @@
             if (img->readPixels(pixmap, 0, 0)) {
                 fImage = SkImage::MakeRasterCopy(pixmap);
             }
         }
     }
     void onDraw(int loops, SkCanvas*) override {
         if (!fImage) {
             return;
         }
         while (loops-- > 0) {
-            SkAutoTUnref<SkPDFObject> object(
-                    SkPDFCreateBitmapObject(fImage.get(), nullptr));
+            auto object = SkPDFCreateBitmapObject(fImage, nullptr);
             SkASSERT(object);
             if (!object) {
                 return;
             }
             test_pdf_object_serialization(object);
         }
     }
 
 private:
     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 {
         sk_sp<SkImage> img(GetResourceAsImage("mandrill_512_q075.jpg"));
         if (!img) { return; }
-        SkAutoTUnref<SkData> encoded(img->refEncoded());
+        sk_sp<SkData> encoded(img->refEncoded());
         SkASSERT(encoded);
         if (!encoded) { return; }
         fImage = img;
     }
     void onDraw(int loops, SkCanvas*) override {
         if (!fImage) {
             SkDEBUGFAIL("");
             return;
         }
         while (loops-- > 0) {
-            SkAutoTUnref<SkPDFObject> object(
-                    SkPDFCreateBitmapObject(fImage.get(), nullptr));
+            auto object = SkPDFCreateBitmapObject(fImage, nullptr);
             SkASSERT(object);
             if (!object) {
                 return;
             }
             test_pdf_object_serialization(object);
         }
     }
 
 private:
     sk_sp<SkImage> fImage;
@@ skipping 11 matching lines @@
     bool isSuitableFor(Backend backend) override {
         return backend == kNonRendering_Backend;
     }
     void onDelayedSetup() override {
         fAsset.reset(GetResourceAsStream("pdf_command_stream.txt"));
     }
     void onDraw(int loops, SkCanvas*) override {
         SkASSERT(fAsset);
         if (!fAsset) { return; }
         while (loops-- > 0) {
-            SkAutoTUnref<SkPDFObject> object(
+            sk_sp<SkPDFObject> object(
                     new SkPDFSharedStream(fAsset->duplicate()));
             test_pdf_object_serialization(object);
         }
     }
 
 private:
     SkAutoTDelete<SkStreamAsset> fAsset;
 };
 
 // Test speed of SkPDFUtils::FloatToDecimal for typical floats that
@@ skipping 11 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;)