commit 748015840e3d6529fa538977b786a5872d8a9969
author Hal Canary <halcanary@google.com> Tue Dec 18 16:30:41 2018 -0500
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Wed Dec 19 22:45:06 2018 +0000
tree 6c482fa81252b8740b7260691d5adf4beadd9241
parent 95be08426d74edca86e44af8c722ac2f6631f091

SkPDF: SkPDFObject no longer reference-counted!

  * sed 's/sk_sp<SkPDF\(Object\|Array\|Dict\)>/std::unique_ptr<SkPDF\1>/g'
  * Added SkPDFMakeDict()
  * Let SkPDFMakeArray() take zero arguments.

Bug: skia:8630

Change-Id: I08dc11e974f1d71e09a33af6bdbcb5f01b07d186
Reviewed-on: https://skia-review.googlesource.com/c/179063
Commit-Queue: Hal Canary <halcanary@google.com>
Reviewed-by: Herb Derby <herb@google.com>
Auto-Submit: Hal Canary <halcanary@google.com>

src/pdf/SkPDFFormXObject.cpp

diff --git a/src/pdf/SkPDFFormXObject.cpp b/src/pdf/SkPDFFormXObject.cpp
index 7dfa562..1586063 100644
--- a/src/pdf/SkPDFFormXObject.cpp
+++ b/src/pdf/SkPDFFormXObject.cpp
@@ -11,11 +11,11 @@
 
 SkPDFIndirectReference SkPDFMakeFormXObject(SkPDFDocument* doc,
                                             std::unique_ptr<SkStreamAsset> content,
-                                            sk_sp<SkPDFArray> mediaBox,
-                                            sk_sp<SkPDFDict> resourceDict,
+                                            std::unique_ptr<SkPDFArray> mediaBox,
+                                            std::unique_ptr<SkPDFDict> resourceDict,
                                             const SkMatrix& inverseTransform,
                                             const char* colorSpace) {
-    sk_sp<SkPDFDict> dict = sk_make_sp<SkPDFDict>();
+    std::unique_ptr<SkPDFDict> dict = SkPDFMakeDict();
     dict->insertName("Type", "XObject");
     dict->insertName("Subtype", "Form");
     if (!inverseTransform.isIdentity()) {
@@ -28,7 +28,7 @@
     // isolated blending.  Do this conditionally if that changes.
     // TODO(halcanary): Is this comment obsolete, since we use it for
     // alpha masks?
-    auto group = sk_make_sp<SkPDFDict>("Group");
+    auto group = SkPDFMakeDict("Group");
     group->insertName("S", "Transparency");
     if (colorSpace != nullptr) {
         group->insertName("CS", colorSpace);