Simplify reference management in SkPDF

src/pdf/SkPDFDocument.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 "SkPDFCatalog.h"
@@ skipping 64 matching lines @@
     }
 
     fSubstitutes.safeUnrefAll();
 
     fDocCatalog->unref();
     SkSafeUnref(fTrailerDict);
     SkDELETE(fFirstPageResources);
     SkDELETE(fOtherPageResources);
 }
 
-namespace {
-class Streamer {
-public:
-    Streamer(SkPDFCatalog* cat, SkWStream* out)
-        : fCat(cat), fOut(out), fBaseOffset(SkToOffT(out->bytesWritten())) {
-    }
-
-    void stream(SkPDFObject* object) {
-        fCat->setFileOffset(object, this->offset());
-        SkPDFObject* realObject = fCat->getSubstituteObject(object);
-        fCat->emitObjectNumber(fOut, realObject);
-        fOut->writeText(" obj\n");
-        realObject->emitObject(fOut, fCat);
-        fOut->writeText("\nendobj\n");
-    }
-
-    off_t offset() {
-        return SkToOffT(fOut->bytesWritten()) - fBaseOffset;
-    }
-
-private:
-    SkPDFCatalog* const fCat;
-    SkWStream* const fOut;
-    const off_t fBaseOffset;
-};
-}  // namespace
-
 bool SkPDFDocument::emitPDF(SkWStream* stream) {
     if (fPages.isEmpty()) {
         return false;
     }
     for (int i = 0; i < fPages.count(); i++) {
         if (fPages[i] == NULL) {
             return false;
         }
     }
 
@@ skipping 58 matching lines @@
             SkPDFDict* raw_dests = dests.get();
             fFirstPageResources->add(dests.detach());  // Transfer ownership.
             fCatalog->addObject(raw_dests, true /* onFirstPage */);
             fDocCatalog->insert("Dests", SkNEW_ARGS(SkPDFObjRef, (raw_dests)))->unref();
         }
 
         // Build font subsetting info before proceeding.
         perform_font_subsetting(fCatalog.get(), fPages, &fSubstitutes);
     }
 
-    Streamer out(fCatalog, stream);
+    SkPDFObjectSet resourceSet;
+    if (resourceSet.add(fDocCatalog)) {
+        fDocCatalog->addResources(&resourceSet, fCatalog);
+    }
+    off_t baseOffset = SkToOffT(stream->bytesWritten());
     emitHeader(stream);
-
-    out.stream(fDocCatalog);
-    out.stream(fPages[0]);
-    out.stream(fPages[0]->getContentStream());
-
-    for (int i = 0; i < fFirstPageResources->count(); i++) {
-        out.stream((*fFirstPageResources)[i]);
+    for (int i = 0; i < resourceSet.count(); ++i) {
+        SkPDFObject* object = resourceSet[i];
+        fCatalog->setFileOffset(object,
+                                SkToOffT(stream->bytesWritten()) - baseOffset);
+        SkASSERT(object == fCatalog->getSubstituteObject(object));
+        fCatalog->emitObjectNumber(stream, object);
+        stream->writeText(" obj\n");
+        object->emitObject(stream, fCatalog);
+        stream->writeText("\nendobj\n");
     }
-
-    SkTSet<SkPDFObject*>* firstPageSubstituteResources =
-            fCatalog->getSubstituteList(true);
-    for (int i = 0; i < firstPageSubstituteResources->count(); ++i) {
-        out.stream((*firstPageSubstituteResources)[i]);
-    }
-    // TODO(vandebo): Support linearized format
-    // if (fPages.size() > 1) {
-    //     // TODO(vandebo): Save the file offset for the first page xref table.
-    //     fCatalog->emitXrefTable(stream, true);
-    // }
-
-    for (int i = 0; i < fPageTree.count(); i++) {
-        out.stream(fPageTree[i]);
-    }
-
-    for (int i = 1; i < fPages.count(); i++) {
-        out.stream(fPages[i]->getContentStream());
-    }
-
-    for (int i = 0; i < fOtherPageResources->count(); i++) {
-        out.stream((*fOtherPageResources)[i]);
-    }
-
-    SkTSet<SkPDFObject*>* otherSubstituteResources =
-            fCatalog->getSubstituteList(false);
-    for (int i = 0; i < otherSubstituteResources->count(); ++i) {
-        out.stream((*otherSubstituteResources)[i]);
-    }
-
-    fXRefFileOffset = out.offset();
+    fXRefFileOffset = SkToOffT(stream->bytesWritten()) - baseOffset;
     int64_t objCount = fCatalog->emitXrefTable(stream, fPages.count() > 1);
     emitFooter(stream, objCount);
     return true;
 }
 
 bool SkPDFDocument::setPage(int pageNumber, SkPDFDevice* pdfDevice) {
     if (!fPageTree.isEmpty()) {
         return false;
     }
 
@@ skipping 108 matching lines @@
         fTrailerDict->insertInt("Size", int(objCount));
         fTrailerDict->insert("Root", new SkPDFObjRef(fDocCatalog))->unref();
     }
 
     stream->writeText("trailer\n");
     fTrailerDict->emitObject(stream, fCatalog.get());
     stream->writeText("\nstartxref\n");
     stream->writeBigDecAsText(fXRefFileOffset);
     stream->writeText("\n%%EOF");
 }