Simplify reference management in SkPDF

src/pdf/SkPDFCatalog.cpp

 
 /*
  * Copyright 2010 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkPDFCatalog.h"
@@ skipping 38 matching lines @@
     stream->writeDecAsText(assignObjNum(obj));
     stream->writeText(" 0");  // Generation number is always 0.
 }
 
 size_t SkPDFCatalog::getObjectNumberSize(SkPDFObject* obj) {
     SkDynamicMemoryWStream buffer;
     emitObjectNumber(&buffer, obj);
     return buffer.getOffset();
 }
 
-int SkPDFCatalog::findObjectIndex(SkPDFObject* obj) const {
+int SkPDFCatalog::findObjectIndex(SkPDFObject* obj) {

[mtklein, 2015/01/26 23:38:59]

Seems like this wants a new name, lookupOrAdd?

[hal.canary, 2015/02/09 23:35:01]

I'm going to heavily refactor this class in a later CL (combine the catalog and
the resource set).  I'll hold off until then.

     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);
         }
     }
-    return -1;
+    struct 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;
@@ skipping 61 matching lines @@
 #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
-    // Check if the original is on first page.
-    bool onFirstPage = false;
-    for (int i = 0; i < fCatalog.count(); ++i) {
-        if (fCatalog[i].fObject == original) {
-            onFirstPage = fCatalog[i].fOnFirstPage;
-            break;
-        }
-#if defined(SK_DEBUG)
-        if (i == fCatalog.count() - 1) {
-            SkASSERT(false);  // original not in catalog
-            return;
-        }
-#endif
-    }
-
     SubstituteMapping newMapping(original, substitute);
     fSubstituteMap.append(1, &newMapping);
-
-    // Add resource objects of substitute object to catalog.
-    SkTSet<SkPDFObject*>* targetSet = getSubstituteList(onFirstPage);
-    SkTSet<SkPDFObject*> newResourceObjects;
-    newMapping.fSubstitute->getResources(*targetSet, &newResourceObjects);
-    for (int i = 0; i < newResourceObjects.count(); ++i) {
-        addObject(newResourceObjects[i], onFirstPage);
-    }
-    // mergeInto returns the number of duplicates.
-    // If there are duplicates, there is a bug and we mess ref counting.
-    SkDEBUGCODE(int duplicates =) targetSet->mergeInto(newResourceObjects);
-    SkASSERT(duplicates == 0);
 }
 
 SkPDFObject* SkPDFCatalog::getSubstituteObject(SkPDFObject* object) {
     for (int i = 0; i < fSubstituteMap.count(); ++i) {
         if (object == fSubstituteMap[i].fOriginal) {
             return fSubstituteMap[i].fSubstitute;
         }
     }
     return object;
 }
 
-SkTSet<SkPDFObject*>* SkPDFCatalog::getSubstituteList(bool firstPage) {
-    return firstPage ? &fSubstituteResourcesFirstPage :
-                       &fSubstituteResourcesRemaining;
-}