SkPDF: use sk_make_sp<T> when it makes sense.

src/doc/SkDocument_PDF.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 "SkDocument.h"
 #include "SkPDFCanon.h"
 #include "SkPDFDevice.h"
@@ skipping 59 matching lines @@
         entry = iterator.next();
     }
 }
 
 static SkPDFObject* create_pdf_page_content(const SkPDFDevice* pageDevice) {
     SkAutoTDelete<SkStreamAsset> content(pageDevice->content());
     return new SkPDFStream(content.get());
 }
 
 static SkPDFDict* create_pdf_page(const SkPDFDevice* pageDevice) {
-    sk_sp<SkPDFDict> page(new SkPDFDict("Page"));
+    auto page = sk_make_sp<SkPDFDict>("Page");
     page->insertObject("Resources", pageDevice->createResourceDict());
     page->insertObject("MediaBox", pageDevice->copyMediaBox());
-    sk_sp<SkPDFArray> annotations(new SkPDFArray);
+    auto annotations = sk_make_sp<SkPDFArray>();
     pageDevice->appendAnnotations(annotations.get());
     if (annotations->size() > 0) {
         page->insertObject("Annots", annotations.release());
     }
     page->insertObjRef("Contents", create_pdf_page_content(pageDevice));
     return page.release();
 }
 
 static void generate_page_tree(const SkTDArray<SkPDFDict*>& pages,
                                SkTDArray<SkPDFDict*>* pageTree,
@@ skipping 20 matching lines @@
     nextRoundNodes.setReserve((pages.count() + kNodeSize - 1)/kNodeSize);
 
     int treeCapacity = kNodeSize;
     do {
         for (int i = 0; i < curNodes.count(); ) {
             if (i > 0 && i + 1 == curNodes.count()) {
                 nextRoundNodes.push(curNodes[i]);
                 break;
             }
 
-            sk_sp<SkPDFDict> newNode(new SkPDFDict("Pages"));
-            sk_sp<SkPDFArray> kids(new SkPDFArray);
+            auto newNode = sk_make_sp<SkPDFDict>("Pages");
+            auto kids = sk_make_sp<SkPDFArray>();
             kids->reserve(kNodeSize);
 
             int count = 0;
             for (; i < curNodes.count() && count < kNodeSize; i++, count++) {
                 curNodes[i]->insertObjRef("Parent", SkRef(newNode.get()));
                 kids->appendObjRef(SkRef(curNodes[i]));
 
                 // TODO(vandebo): put the objects in strict access order.
                 // Probably doesn't matter because they are so small.
                 if (curNodes[i] != pages[0]) {
@@ skipping 31 matching lines @@
 }
 
 static bool emit_pdf_document(const SkTDArray<const SkPDFDevice*>& pageDevices,
                               const SkPDFMetadata& metadata,
                               SkWStream* stream) {
     if (pageDevices.isEmpty()) {
         return false;
     }
 
     SkTDArray<SkPDFDict*> pages;
-    sk_sp<SkPDFDict> dests(new SkPDFDict);
+    auto dests = sk_make_sp<SkPDFDict>();
 
     for (int i = 0; i < pageDevices.count(); i++) {
         SkASSERT(pageDevices[i]);
         SkASSERT(i == 0 ||
                  pageDevices[i - 1]->getCanon() == pageDevices[i]->getCanon());
         sk_sp<SkPDFDict> page(create_pdf_page(pageDevices[i]));
         pageDevices[i]->appendDestinations(dests.get(), page.get());
         pages.push(page.release());
     }
 
-    sk_sp<SkPDFDict> docCatalog(new SkPDFDict("Catalog"));
+    auto docCatalog = sk_make_sp<SkPDFDict>("Catalog");
 
     sk_sp<SkPDFObject> infoDict(
             metadata.createDocumentInformationDict());
 
     sk_sp<SkPDFObject> id, xmp;
 #ifdef SK_PDF_GENERATE_PDFA
     SkPDFMetadata::UUID uuid = metadata.uuid();
     // We use the same UUID for Document ID and Instance ID since this
     // is the first revision of this document (and Skia does not
     // support revising existing PDF documents).
     // If we are not in PDF/A mode, don't use a UUID since testing
     // works best with reproducible outputs.
     id.reset(SkPDFMetadata::CreatePdfId(uuid, uuid));
     xmp.reset(metadata.createXMPObject(uuid, uuid));
     docCatalog->insertObjRef("Metadata", xmp.release());
 
     // sRGB is specified by HTML, CSS, and SVG.
-    sk_sp<SkPDFDict> outputIntent(new SkPDFDict("OutputIntent"));
+    auto outputIntent = sk_make_sp<SkPDFDict>("OutputIntent");
     outputIntent->insertName("S", "GTS_PDFA1");
     outputIntent->insertString("RegistryName", "http://www.color.org");
     outputIntent->insertString("OutputConditionIdentifier",
                                "sRGB IEC61966-2.1");
-    sk_sp<SkPDFArray> intentArray(new SkPDFArray);
+    auto intentArray = sk_make_sp<SkPDFArray>();
     intentArray->appendObject(outputIntent.release());
     // Don't specify OutputIntents if we are not in PDF/A mode since
     // no one has ever asked for this feature.
     docCatalog->insertObject("OutputIntents", intentArray.release());
 #endif
 
     SkTDArray<SkPDFDict*> pageTree;
     SkPDFDict* pageTreeRoot;
     generate_page_tree(pages, &pageTree, &pageTreeRoot);
     docCatalog->insertObjRef("Pages", SkRef(pageTreeRoot));
@@ skipping 181 matching lines @@
 
 SkDocument* SkDocument::CreatePDF(const char path[], SkScalar dpi) {
     SkFILEWStream* stream = new SkFILEWStream(path);
     if (!stream->isValid()) {
         delete stream;
         return nullptr;
     }
     auto delete_wstream = [](SkWStream* stream, bool) { delete stream; };
     return new SkDocument_PDF(stream, delete_wstream, dpi, nullptr);
 }