SkPDF: metadata first

Motivation: while experimenting with serializing images immediately, I would like to keep serializing metadata first.

TBR=djsollen@google.com
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1780463008

Review URL: https://codereview.chromium.org/1780463008

diff --git a/site/user/sample/pdf.md b/site/user/sample/pdf.md
index 0a2aa4d471f16f88c1cd8a801551d64a9588f0f7..360fb4d02372b5a741107d12fe24adeb7e049a32 100644 (file)
--- a/site/user/sample/pdf.md
+++ b/site/user/sample/pdf.md
@@ -4,15 +4,24 @@ Using Skia's PDF Backend
 Here is an example of using Skia's PDF backend in the recommended way:
 via the SkDocument and SkCanvas APIs.
 
-<!--?prettify?-->
+<!--?prettify lang=cc?-->
 
     #include "SkDocument.h"
 
-    bool WritePDF() {
-        SkWStream* outputStream = ....;
-
-        SkAutoTUnref<SkDocument> pdfDocument(
-                SkDocument::CreatePDF(outputStream));
+    bool WritePDF(SkWStream* outputStream) {
+        sk_sp<SkDocument> pdfDocument(SkDocument::CreatePDF(outputStream));
+        typedef SkDocument::Attribute Attr;
+        Attr info[] = {
+            Attr(SkString("Title"),    SkString("....")),
+            Attr(SkString("Author"),   SkString("....")),
+            Attr(SkString("Subject"),  SkString("....")),
+            Attr(SkString("Keywords"), SkString("....")),
+            Attr(SkString("Creator"),  SkString("....")),
+        };
+        int infoCount = sizeof(info) / sizeof(info[0]);
+        SkTime::DateTime now;
+        SkTime::GetDateTime(&now);
+        pdfDocument->setMetadata(info, infoCount, &now, &now);
 
         int numberOfPages = ....;
         for (int page = 0; page < numberOfPages; ++page) {
@@ -25,16 +34,5 @@ via the SkDocument and SkCanvas APIs.
 
             pdfDocument->endPage();
         }
-
-        SkTArray<SkDocument::Attribute> info;
-        info.emplace_back(SkString("Title"), SkString("...."));
-        info.emplace_back(SkString("Author"), SkString("...."));
-        info.emplace_back(SkString("Subject"), SkString("...."));
-        info.emplace_back(SkString("Keywords"), SkString("...."));
-        info.emplace_back(SkString("Creator"), SkString("...."));
-        SkTime::DateTime now;
-        SkTime::GetDateTime(&now);
-        pdfDocument->setMetadata(info, &now, &now);
-
         return pdfDocument->close();
     }

diff --git a/tests/PDFMetadataAttributeTest.cpp b/tests/PDFMetadataAttributeTest.cpp
index e436ee29efa2816fd3242e7632988e72780ff5aa..bfc2b41fa0152da17cb60f6ac3e653d608290c94 100644 (file)
--- a/tests/PDFMetadataAttributeTest.cpp
+++ b/tests/PDFMetadataAttributeTest.cpp
@@ -13,15 +13,18 @@ DEF_TEST(SkPDF_MetadataAttribute, r) {
     REQUIRE_PDF_DOCUMENT(SkPDF_MetadataAttribute, r);
     SkDynamicMemoryWStream pdf;
     SkAutoTUnref<SkDocument> doc(SkDocument::CreatePDF(&pdf));
-    SkTArray<SkDocument::Attribute> info;
-    info.emplace_back(SkString("Title"), SkString("A1"));
-    info.emplace_back(SkString("Author"), SkString("A2"));
-    info.emplace_back(SkString("Subject"), SkString("A3"));
-    info.emplace_back(SkString("Keywords"), SkString("A4"));
-    info.emplace_back(SkString("Creator"), SkString("A5"));
+    typedef SkDocument::Attribute Attr;
+    Attr info[] = {
+        Attr(SkString("Title"),    SkString("A1")),
+        Attr(SkString("Author"),   SkString("A2")),
+        Attr(SkString("Subject"),  SkString("A3")),
+        Attr(SkString("Keywords"), SkString("A4")),
+        Attr(SkString("Creator"),  SkString("A5")),
+    };
+    int infoCount = sizeof(info) / sizeof(info[0]);
     SkTime::DateTime now;
     SkTime::GetDateTime(&now);
-    doc->setMetadata(&info[0], info.count(), &now, &now);
+    doc->setMetadata(&info[0], infoCount, &now, &now);
     doc->beginPage(612.0f, 792.0f);
     doc->close();
     SkAutoTUnref<SkData> data(pdf.copyToData());