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/SkPDFShader.cpp

diff --git a/src/pdf/SkPDFShader.cpp b/src/pdf/SkPDFShader.cpp
index 168805b..0f2ac72 100644
--- a/src/pdf/SkPDFShader.cpp
+++ b/src/pdf/SkPDFShader.cpp
@@ -245,8 +245,8 @@
     }
 
     auto imageShader = patternDevice->content();
-    sk_sp<SkPDFDict> resourceDict = patternDevice->makeResourceDict();
-    sk_sp<SkPDFDict> dict = sk_make_sp<SkPDFDict>();
+    std::unique_ptr<SkPDFDict> resourceDict = patternDevice->makeResourceDict();
+    std::unique_ptr<SkPDFDict> dict = SkPDFMakeDict();
     SkPDFUtils::PopulateTilingPatternDict(dict.get(), patternBBox,
                                           std::move(resourceDict), finalMatrix);
     return SkPDFStreamOut(std::move(dict), std::move(imageShader), doc);