SKPDF: refactor pdfcatalog and pdfdocument

src/pdf/SkPDFCatalog.cpp

Index: src/pdf/SkPDFCatalog.cpp
diff --git a/src/pdf/SkPDFCatalog.cpp b/src/pdf/SkPDFCatalog.cpp
index 4add1649c41fbf8b02aefd26e7ddf4a3da8237c6..7565b8fe4c51eaf9afb57663554e624477b3e98a 100644
--- a/src/pdf/SkPDFCatalog.cpp
+++ b/src/pdf/SkPDFCatalog.cpp
@@ -8,151 +8,10 @@
 
 
 #include "SkPDFCatalog.h"
-#include "SkPDFTypes.h"
-#include "SkStream.h"
-#include "SkTypes.h"
-
-SkPDFCatalog::SkPDFCatalog()
-    : fFirstPageCount(0)
-    , fNextObjNum(1)
-    , fNextFirstPageObjNum(0) {}
 
 SkPDFCatalog::~SkPDFCatalog() {
-    fSubstituteResourcesRemaining.safeUnrefAll();
-    fSubstituteResourcesFirstPage.safeUnrefAll();
-}
-
-SkPDFObject* SkPDFCatalog::addObject(SkPDFObject* obj, bool onFirstPage) {
-    if (findObjectIndex(obj) != -1) {  // object already added
-        return obj;
-    }
-    SkASSERT(fNextFirstPageObjNum == 0);
-    if (onFirstPage) {
-        fFirstPageCount++;
-    }
-
-    Rec newEntry(obj, onFirstPage);
-    fCatalog.append(1, &newEntry);
-    return obj;
+    struct Unrefer {
+        static void Unref(SkPDFObject*, SkPDFObject** v) { (*v)->unref(); }
+    };
+    fSubstituteMap.foreach(&Unrefer::Unref);

[mtklein, 2015/03/24 16:03:05]

fSubstituteMap.foreach([](SkPDFObject*, SkPDFObject** v) { (*v)->unref(); });  
?

[hal.canary, 2015/03/24 20:08:05]

I've never written a C++ lambda before!

Done.

 }
-
-void SkPDFCatalog::setFileOffset(SkPDFObject* obj, off_t offset) {
-    int objIndex = assignObjNum(obj) - 1;
-    SkASSERT(fCatalog[objIndex].fObjNumAssigned);
-    SkASSERT(fCatalog[objIndex].fFileOffset == 0);
-    fCatalog[objIndex].fFileOffset = offset;
-}
-
-int32_t SkPDFCatalog::getObjectNumber(SkPDFObject* obj) {
-    return (int32_t)assignObjNum(obj);
-}
-
-int SkPDFCatalog::findObjectIndex(SkPDFObject* obj) {
-    for (int i = 0; i < fCatalog.count(); i++) {
-        if (fCatalog[i].fObject == obj) {
-            return i;
-        }
-    }
-    // If it's not in the main array, check if it's a substitute object.
-    for (int i = 0; i < fSubstituteMap.count(); ++i) {
-        if (fSubstituteMap[i].fSubstitute == obj) {
-            return findObjectIndex(fSubstituteMap[i].fOriginal);
-        }
-    }
-    Rec newEntry(obj, false);
-    fCatalog.append(1, &newEntry);
-    return fCatalog.count() - 1;
-}
-
-int SkPDFCatalog::assignObjNum(SkPDFObject* obj) {
-    int pos = findObjectIndex(obj);
-    // If this assert fails, it means you probably forgot to add an object
-    // to the resource list.
-    SkASSERT(pos >= 0);
-    uint32_t currentIndex = pos;
-    if (fCatalog[currentIndex].fObjNumAssigned) {
-        return currentIndex + 1;
-    }
-
-    // First assignment.
-    if (fNextFirstPageObjNum == 0) {
-        fNextFirstPageObjNum = fCatalog.count() - fFirstPageCount + 1;
-    }
-
-    uint32_t objNum;
-    if (fCatalog[currentIndex].fOnFirstPage) {
-        objNum = fNextFirstPageObjNum;
-        fNextFirstPageObjNum++;
-    } else {
-        objNum = fNextObjNum;
-        fNextObjNum++;
-    }
-
-    // When we assign an object an object number, we put it in that array
-    // offset (minus 1 because object number 0 is reserved).
-    SkASSERT(!fCatalog[objNum - 1].fObjNumAssigned);
-    if (objNum - 1 != currentIndex) {
-        SkTSwap(fCatalog[objNum - 1], fCatalog[currentIndex]);
-    }
-    fCatalog[objNum - 1].fObjNumAssigned = true;
-    return objNum;
-}
-
-int32_t SkPDFCatalog::emitXrefTable(SkWStream* stream, bool firstPage) {
-    int first = -1;
-    int last = fCatalog.count() - 1;
-    // TODO(vandebo): Support linearized format.
-    // int last = fCatalog.count() - fFirstPageCount - 1;
-    // if (firstPage) {
-    //     first = fCatalog.count() - fFirstPageCount;
-    //     last = fCatalog.count() - 1;
-    // }
-
-    stream->writeText("xref\n");
-    stream->writeDecAsText(first + 1);
-    stream->writeText(" ");
-    stream->writeDecAsText(last - first + 1);
-    stream->writeText("\n");
-
-    if (first == -1) {
-        stream->writeText("0000000000 65535 f \n");
-        first++;
-    }
-    for (int i = first; i <= last; i++) {
-        // For 32 bits platforms, the maximum offset has to fit within off_t
-        // which is a 32 bits signed integer on these platforms.
-        SkDEBUGCODE(static const off_t kMaxOff = SK_MaxS32;)
-        SkASSERT(fCatalog[i].fFileOffset > 0);
-        SkASSERT(fCatalog[i].fFileOffset < kMaxOff);
-        stream->writeBigDecAsText(fCatalog[i].fFileOffset, 10);
-        stream->writeText(" 00000 n \n");
-    }
-
-    return fCatalog.count() + 1;
-}
-
-void SkPDFCatalog::setSubstitute(SkPDFObject* original,
-                                 SkPDFObject* substitute) {
-#if defined(SK_DEBUG)
-    // Sanity check: is the original already in substitute list?
-    for (int i = 0; i < fSubstituteMap.count(); ++i) {
-        if (original == fSubstituteMap[i].fSubstitute ||
-            original == fSubstituteMap[i].fOriginal) {
-            SkASSERT(false);
-            return;
-        }
-    }
-#endif
-    SubstituteMapping newMapping(original, substitute);
-    fSubstituteMap.append(1, &newMapping);
-}
-
-SkPDFObject* SkPDFCatalog::getSubstituteObject(SkPDFObject* object) {
-    for (int i = 0; i < fSubstituteMap.count(); ++i) {
-        if (object == fSubstituteMap[i].fOriginal) {
-            return fSubstituteMap[i].fSubstitute;
-        }
-    }
-    return object;
-}
-