Simplify reference management in SkPDF

src/pdf/SkPDFTypes.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"
 #include "SkPDFTypes.h"
 #include "SkStream.h"
 
 #ifdef SK_BUILD_FOR_WIN
     #define SNPRINTF    _snprintf
 #else
     #define SNPRINTF    snprintf
 #endif
 
-///////////////////////////////////////////////////////////////////////////////
-
-void SkPDFObject::getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
-                               SkTSet<SkPDFObject*>* newResourceObjects) {}
-
-void SkPDFObject::AddResourceHelper(SkPDFObject* resource,
-                                    SkTDArray<SkPDFObject*>* list) {
-    list->push(resource);
-    resource->ref();
-}
-
-void SkPDFObject::GetResourcesHelper(
-        const SkTDArray<SkPDFObject*>* resources,
-        const SkTSet<SkPDFObject*>& knownResourceObjects,
-        SkTSet<SkPDFObject*>* newResourceObjects) {
-    if (resources->count()) {
-        newResourceObjects->setReserve(
-            newResourceObjects->count() + resources->count());
-        for (int i = 0; i < resources->count(); i++) {
-            if (!knownResourceObjects.contains((*resources)[i]) &&
-                    !newResourceObjects->contains((*resources)[i])) {
-                newResourceObjects->add((*resources)[i]);
-                (*resources)[i]->ref();
-                (*resources)[i]->getResources(knownResourceObjects,
-                                              newResourceObjects);
-            }
-        }
-    }
-}
-
 ////////////////////////////////////////////////////////////////////////////////
 
 SkPDFObjRef::SkPDFObjRef(SkPDFObject* obj) : fObj(obj) {
     SkSafeRef(obj);
 }
 
 SkPDFObjRef::~SkPDFObjRef() {}
 
 void SkPDFObjRef::emitObject(SkWStream* stream, SkPDFCatalog* catalog) {
-    catalog->emitObjectNumber(stream, fObj.get());
-    stream->writeText(" R");
+    stream->writeDecAsText(catalog->getObjectNumber(fObj.get()));
+    stream->writeText(" 0 R");  // Generation number is always 0.
+}
+
+void SkPDFObjRef::addResources(SkTSet<SkPDFObject*>* resourceSet,
+                               SkPDFCatalog* catalog) const {
+    SkPDFObject* obj = catalog->getSubstituteObject(fObj);
+    SkASSERT(obj);
+    if (resourceSet->add(obj)) {
+        obj->addResources(resourceSet, catalog);
+    }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 SkPDFInt::SkPDFInt(int32_t value) : fValue(value) {}
 SkPDFInt::~SkPDFInt() {}
 
 void SkPDFInt::emitObject(SkWStream* stream, SkPDFCatalog* catalog) {
     stream->writeDecAsText(fValue);
 }
@@ skipping 199 matching lines @@
     stream->writeText("[");
     for (int i = 0; i < fValue.count(); i++) {
         catalog->getSubstituteObject(fValue[i])->emitObject(stream, catalog);
         if (i + 1 < fValue.count()) {
             stream->writeText(" ");
         }
     }
     stream->writeText("]");
 }
 
+void SkPDFArray::addResources(SkTSet<SkPDFObject*>* resourceSet,
+                              SkPDFCatalog* catalog) const {
+    for (int i = 0; i < fValue.count(); i++) {
+        catalog->getSubstituteObject(fValue[i])
+                ->addResources(resourceSet, catalog);
+    }
+}
+
 void SkPDFArray::reserve(int length) {
     SkASSERT(length <= kMaxLen);
     fValue.setReserve(length);
 }
 
 SkPDFObject* SkPDFArray::setAt(int offset, SkPDFObject* value) {
     SkASSERT(offset < fValue.count());
     value->ref();
     fValue[offset]->unref();
     fValue[offset] = value;
@@ skipping 50 matching lines @@
         SkASSERT(fValue[i].value);
         fValue[i].key->emitObject(stream, catalog);
         stream->writeText(" ");
         catalog->getSubstituteObject(fValue[i].value)
                 ->emitObject(stream, catalog);
         stream->writeText("\n");
     }
     stream->writeText(">>");
 }
 
+void SkPDFDict::addResources(SkTSet<SkPDFObject*>* resourceSet,
+                             SkPDFCatalog* catalog) const {
+    for (int i = 0; i < fValue.count(); i++) {
+        SkASSERT(fValue[i].key);
+        SkASSERT(fValue[i].value);
+        fValue[i].key->addResources(resourceSet, catalog);
+        catalog->getSubstituteObject(fValue[i].value)
+                ->addResources(resourceSet, catalog);
+    }
+}
+
 SkPDFObject*  SkPDFDict::append(SkPDFName* key, SkPDFObject* value) {
     SkASSERT(key);
     SkASSERT(value);
     SkAutoMutexAcquire lock(fMutex); // If the SkTDArray resizes while
                                      // two threads access array, one
                                      // is left with a bad pointer.
     *(fValue.append()) = Rec(key, value);
     return value;
 }
 
@@ skipping 47 matching lines @@
 void SkPDFDict::mergeFrom(const SkPDFDict& other) {
     SkAutoMutexAcquire lockOther(other.fMutex);
     SkTDArray<Rec> copy(other.fValue);
     lockOther.release();  // Do not hold both mutexes at once.
 
     SkAutoMutexAcquire lock(fMutex);
     for (int i = 0; i < copy.count(); i++) {
         *(fValue.append()) = Rec(SkRef(copy[i].key), SkRef(copy[i].value));
     }
 }