commit 8c662a7d6ef5bba316970d9db9a142e2f0de2197
author Dominic Mazzoni <dmazzoni@chromium.org> Wed Jun 17 16:46:03 2020 -0700
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Thu Jun 18 13:57:23 2020 +0000
tree 30b414e6feab202c5ab8a5728966779b1e05d46e
parent a85e4bf009073c09500e0aff5ca71e4a0bc3c756

Get rid of deprecated API to add children to PDF tag nodes.

fChildren/fChildCount was replaced with fChildVector and Chromium
migrated to the new API a while back, it's now safe to remove the
older interface.

Bug: chromium:607777
Change-Id: I7311d3b51f1b71209dcc024ae51637536d560619
Reviewed-on: https://skia-review.googlesource.com/c/skia/+/297260
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>

tests/PDFTaggedTest.cpp

diff --git a/tests/PDFTaggedTest.cpp b/tests/PDFTaggedTest.cpp
index fa1c896..385e627 100644
--- a/tests/PDFTaggedTest.cpp
+++ b/tests/PDFTaggedTest.cpp
@@ -35,72 +35,69 @@
     metadata.fModified = now;
 
     // The document tag.
-    PDFTag root;
-    root.fNodeId = 1;
-    root.fType = SkPDF::DocumentStructureType::kDocument;
-    root.fChildCount = 6;
-    PDFTag rootChildren[6];
-    root.fChildren = rootChildren;
+    auto root = std::make_unique<PDFTag>();
+    root->fNodeId = 1;
+    root->fType = SkPDF::DocumentStructureType::kDocument;
 
     // Heading.
-    PDFTag& h1 = rootChildren[0];
-    h1.fNodeId = 2;
-    h1.fType = SkPDF::DocumentStructureType::kH1;
-    h1.fChildCount = 0;
+    auto h1 = std::make_unique<PDFTag>();
+    h1->fNodeId = 2;
+    h1->fType = SkPDF::DocumentStructureType::kH1;
+    root->fChildVector.push_back(std::move(h1));
 
     // Initial paragraph.
-    PDFTag& p = rootChildren[1];
-    p.fNodeId = 3;
-    p.fType = SkPDF::DocumentStructureType::kP;
-    p.fChildCount = 0;
+    auto p = std::make_unique<PDFTag>();
+    p->fNodeId = 3;
+    p->fType = SkPDF::DocumentStructureType::kP;
+    root->fChildVector.push_back(std::move(p));
 
     // Hidden div. This is never referenced by marked content
     // so it should not appear in the resulting PDF.
-    PDFTag& div = rootChildren[2];
-    div.fNodeId = 4;
-    div.fType = SkPDF::DocumentStructureType::kDiv;
-    div.fChildCount = 0;
+    auto div = std::make_unique<PDFTag>();
+    div->fNodeId = 4;
+    div->fType = SkPDF::DocumentStructureType::kDiv;
+    root->fChildVector.push_back(std::move(div));
 
     // A bulleted list of two items.
-    PDFTag& l = rootChildren[3];
-    l.fNodeId = 5;
-    l.fType = SkPDF::DocumentStructureType::kL;
-    l.fChildCount = 4;
-    PDFTag listChildren[4];
-    l.fChildren = listChildren;
+    auto l = std::make_unique<PDFTag>();
+    l->fNodeId = 5;
+    l->fType = SkPDF::DocumentStructureType::kL;
 
-    PDFTag& lm1 = listChildren[0];
-    lm1.fNodeId = 6;
-    lm1.fType = SkPDF::DocumentStructureType::kLbl;
-    lm1.fChildCount = 0;
-    PDFTag& li1 = listChildren[1];
-    li1.fNodeId = 7;
-    li1.fType = SkPDF::DocumentStructureType::kLI;
-    li1.fChildCount = 0;
+    auto lm1 = std::make_unique<PDFTag>();
+    lm1->fNodeId = 6;
+    lm1->fType = SkPDF::DocumentStructureType::kLbl;
+    l->fChildVector.push_back(std::move(lm1));
 
-    PDFTag& lm2 = listChildren[2];
-    lm2.fNodeId = 8;
-    lm2.fType = SkPDF::DocumentStructureType::kLbl;
-    lm2.fChildCount = 0;
-    PDFTag& li2 = listChildren[3];
-    li2.fNodeId = 9;
-    li2.fType = SkPDF::DocumentStructureType::kLI;
-    li2.fChildCount = 0;
+    auto li1 = std::make_unique<PDFTag>();
+    li1->fNodeId = 7;
+    li1->fType = SkPDF::DocumentStructureType::kLI;
+    l->fChildVector.push_back(std::move(li1));
+
+    auto lm2 = std::make_unique<PDFTag>();
+    lm2->fNodeId = 8;
+    lm2->fType = SkPDF::DocumentStructureType::kLbl;
+    l->fChildVector.push_back(std::move(lm2));
+    auto li2 = std::make_unique<PDFTag>();
+    li2->fNodeId = 9;
+    li2->fType = SkPDF::DocumentStructureType::kLI;
+    l->fChildVector.push_back(std::move(li2));
+
+    root->fChildVector.push_back(std::move(l));
 
     // Paragraph spanning two pages.
-    PDFTag& p2 = rootChildren[4];
-    p2.fNodeId = 10;
-    p2.fType = SkPDF::DocumentStructureType::kP;
-    p2.fChildCount = 0;
+    auto p2 = std::make_unique<PDFTag>();
+    p2->fNodeId = 10;
+    p2->fType = SkPDF::DocumentStructureType::kP;
+    root->fChildVector.push_back(std::move(p2));
 
     // Image with alt text.
-    PDFTag& img = rootChildren[5];
-    img.fNodeId = 11;
-    img.fType = SkPDF::DocumentStructureType::kFigure;
-    img.fAlt = "Red box";
-    img.fChildCount = 0;
+    auto img = std::make_unique<PDFTag>();
+    img->fNodeId = 11;
+    img->fType = SkPDF::DocumentStructureType::kFigure;
+    img->fAlt = "Red box";
+    root->fChildVector.push_back(std::move(img));
 
-    metadata.fStructureElementTreeRoot = &root;
+    metadata.fStructureElementTreeRoot = root.get();
     sk_sp<SkDocument> document = SkPDF::MakeDocument(
         &outputStream, metadata);