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

src/doc/SkDocument_PDF.cpp

Index: src/doc/SkDocument_PDF.cpp
diff --git a/src/doc/SkDocument_PDF.cpp b/src/doc/SkDocument_PDF.cpp
index eeb8aa83fd96d5ccce9381a0e32a2dd1bb5eb3d2..a2c270a24c3dcea080c3fa6068b49e1c503758d9 100644
--- a/src/doc/SkDocument_PDF.cpp
+++ b/src/doc/SkDocument_PDF.cpp
@@ -70,10 +70,9 @@ 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();
 }