Merge sub-device annotations in SkPDFDevice::drawDevice()

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 52 matching lines @@
 
 static SkPDFObject* create_pdf_page_content(const SkPDFDevice* pageDevice) {
     SkAutoTDelete<SkStreamAsset> content(pageDevice->content());
     return SkNEW_ARGS(SkPDFStream, (content.get()));
 }
 
 static SkPDFDict* create_pdf_page(const SkPDFDevice* pageDevice) {
     SkAutoTUnref<SkPDFDict> page(SkNEW_ARGS(SkPDFDict, ("Page")));
     page->insertObject("Resources", pageDevice->createResourceDict());
     page->insertObject("MediaBox", pageDevice->copyMediaBox());
-    if (SkPDFArray* annots = pageDevice->getAnnotations()) {
-        SkASSERT(annots->size() > 0);
-        page->insertObject("Annots", SkRef(annots));
-    }
+    SkAutoTUnref<SkPDFArray> annotations(SkNEW(SkPDFArray));
+    pageDevice->appendAnnotations(annotations);

[hal.canary, 2015/09/16 17:30:46]

if (annotations->size() > 0) {
    page->insertObject("Annots", annotations.detach());
}

+    page->insertObject("Annots", annotations.detach());
     page->insertObjRef("Contents", create_pdf_page_content(pageDevice));
     return page.detach();
 }
 
 static void generate_page_tree(const SkTDArray<SkPDFDict*>& pages,
                                SkTDArray<SkPDFDict*>* pageTree,
                                SkPDFDict** rootNode) {
     // PDF wants a tree describing all the pages in the document.  We arbitrary
     // choose 8 (kNodeSize) as the number of allowed children.  The internal
     // nodes have type "Pages" with an array of children, a parent pointer, and
@@ skipping 259 matching lines @@
 
 SkDocument* SkDocument::CreatePDF(const char path[], SkScalar dpi) {
     SkFILEWStream* stream = SkNEW_ARGS(SkFILEWStream, (path));
     if (!stream->isValid()) {
         SkDELETE(stream);
         return NULL;
     }
     auto delete_wstream = [](SkWStream* stream, bool) { SkDELETE(stream); };
     return SkNEW_ARGS(SkDocument_PDF, (stream, delete_wstream, dpi));
 }