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

src/pdf/SkPDFBitmap.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkColorPriv.h"
 #include "SkData.h"
 #include "SkDeflate.h"
@@ skipping 346 matching lines @@
     SkAutoTUnref<const SkImage> fImage;
 };
 
 }  // namespace
 
 ////////////////////////////////////////////////////////////////////////////////
 
 namespace {
 class PDFDefaultBitmap : public SkPDFObject {
 public:
-    void emitObject(SkWStream* stream,
+    void emitObject(SkWStream*  stream,
                     const SkPDFObjNumMap& objNumMap,
-                    const SkPDFSubstituteMap& subs) const override {
-        emit_image_xobject(stream, fImage, false, fSMask, objNumMap, subs);
+                    const SkPDFSubstituteMap& substitutes) const override {
+        emit_image_xobject(stream, fImage, false, fSMask, objNumMap, substitutes);
     }
     void addResources(SkPDFObjNumMap* catalog,
-                      const SkPDFSubstituteMap& subs) const override {
+                      const SkPDFSubstituteMap& substitutes) const override {
         if (fSMask.get()) {
-            SkPDFObject* obj = subs.getSubstitute(fSMask.get());
+            SkPDFObject* obj = substitutes.getSubstitute(fSMask.get());
             SkASSERT(obj);
-            catalog->addObjectRecursively(obj, subs);
+            if (catalog->addObject(obj)) {
+                obj->addResources(catalog, substitutes);
+            }
         }
     }
     PDFDefaultBitmap(const SkImage* image, SkPDFObject* smask)
         : fImage(SkRef(image)), fSMask(smask) {}
 
 private:
     SkAutoTUnref<const SkImage> fImage;
     const SkAutoTUnref<SkPDFObject> fSMask;
 };
 }  // namespace
@@ skipping 56 matching lines @@
             return new PDFJpegBitmap(info.fSize, data, yuv);
         }
     }
     SkPDFObject* smask =
             image_compute_is_opaque(image) ? nullptr : new PDFAlphaBitmap(image);
     #ifdef SK_PDF_IMAGE_STATS
     gRegularImageObjects.fetch_add(1);
     #endif
     return new PDFDefaultBitmap(image, smask);
 }