Revert of SkPDF: Optionally output PDF/A-2b archive format.

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 "SkDeflate.h"
 #include "SkPDFTypes.h"
@@ skipping 159 matching lines @@
         case Type::kInt:
         case Type::kBool:
         case Type::kScalar:
         case Type::kName:
         case Type::kString:
         case Type::kNameSkS:
         case Type::kStringSkS:
             return;  // These have no resources.
         case Type::kObjRef: {
             SkPDFObject* obj = substituteMap.getSubstitute(fObject);
-            objNumMap->addObjectRecursively(obj, substituteMap);
+            if (objNumMap->addObject(obj)) {
+                obj->addResources(objNumMap, substituteMap);
+            }
             return;
         }
         case Type::kObject:
             fObject->addResources(objNumMap, substituteMap);
             return;
         default:
             SkDEBUGFAIL("SkPDFUnion::addResources with bad type");
     }
 }
 
@@ skipping 300 matching lines @@
 
 bool SkPDFObjNumMap::addObject(SkPDFObject* obj) {
     if (fObjectNumbers.find(obj)) {
         return false;
     }
     fObjectNumbers.set(obj, fObjectNumbers.count() + 1);
     fObjects.push(obj);
     return true;
 }
 
-void SkPDFObjNumMap::addObjectRecursively(SkPDFObject* obj,
-                                          const SkPDFSubstituteMap& subs) {
-    if (obj && this->addObject(obj)) {
-        obj->addResources(this, subs);
-    }
-}
-
 int32_t SkPDFObjNumMap::getObjectNumber(SkPDFObject* obj) const {
     int32_t* objectNumberFound = fObjectNumbers.find(obj);
     SkASSERT(objectNumberFound);
     return *objectNumberFound;
 }
 
 #ifdef SK_PDF_IMAGE_STATS
 SkAtomic<int> gDrawImageCalls(0);
 SkAtomic<int> gJpegImageObjects(0);
 SkAtomic<int> gRegularImageObjects(0);
 
 void SkPDFImageDumpStats() {
     SkDebugf("\ntotal PDF drawImage/drawBitmap calls: %d\n"
              "total PDF jpeg images: %d\n"
              "total PDF regular images: %d\n",
              gDrawImageCalls.load(),
              gJpegImageObjects.load(),
              gRegularImageObjects.load());
 }
 #endif // SK_PDF_IMAGE_STATS