Simplify reference management in SkPDF

src/pdf/SkPDFImage.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 "SkPDFImage.h"
 
 #include "SkBitmap.h"
@@ skipping 486 matching lines @@
                                                             srcRect.height()),
                                             encoder));
         }
     } else {
         image = SkNEW_ARGS(SkPDFImage, (NULL, bitmap, false, srcRect, encoder));
     }
     if (alphaData.get() != NULL) {
         SkAutoTUnref<SkPDFImage> mask(
                 SkNEW_ARGS(SkPDFImage, (alphaData.get(), bitmap,
                                         true, srcRect, NULL)));
-        image->addSMask(mask);
+        image->insert("SMask", new SkPDFObjRef(mask))->unref();
     }
-
     return image;
 }
 
-SkPDFImage::~SkPDFImage() {
-    fResources.unrefAll();
-}
-
-SkPDFImage* SkPDFImage::addSMask(SkPDFImage* mask) {
-    fResources.push(mask);
-    mask->ref();
-    insert("SMask", new SkPDFObjRef(mask))->unref();
-    return mask;
-}
-
-void SkPDFImage::getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
-                              SkTSet<SkPDFObject*>* newResourceObjects) {
-    GetResourcesHelper(&fResources, knownResourceObjects, newResourceObjects);
-}
+SkPDFImage::~SkPDFImage() {}
 
 SkPDFImage::SkPDFImage(SkStream* stream,
                        const SkBitmap& bitmap,
                        bool isAlpha,
                        const SkIRect& srcRect,
                        SkPicture::EncodeBitmap encoder)
     : fIsAlpha(isAlpha),
       fSrcRect(srcRect),
       fEncoder(encoder) {
 
@@ skipping 128 matching lines @@
  *  This PDFObject assumes that its constructor was handed
  *  Jpeg-encoded data that can be directly embedded into a PDF.
  */
 class PDFJPEGImage : public SkPDFObject {
     SkAutoTUnref<SkData> fData;
     int fWidth;
     int fHeight;
 public:
     PDFJPEGImage(SkData* data, int width, int height)
         : fData(SkRef(data)), fWidth(width), fHeight(height) {}
-    virtual void getResources(const SkTSet<SkPDFObject*>&,
-                              SkTSet<SkPDFObject*>*) SK_OVERRIDE {}
     virtual void emitObject(
             SkWStream* stream,
             SkPDFCatalog* catalog, bool indirect) SK_OVERRIDE {
         if (indirect) {
             this->emitIndirectObject(stream, catalog);
             return;
         }
         SkASSERT(fData.get());
         const char kPrefaceFormat[] =
             "<<"
@@ skipping 56 matching lines @@
     if (SkIRect::MakeWH(bitmap.width(), bitmap.height()) == subset) {
         SkAutoTUnref<SkData> encodedData(ref_encoded_data(bitmap));
         if (is_jfif_jpeg(encodedData)) {
             return SkNEW_ARGS(PDFJPEGImage,
                               (encodedData, bitmap.width(), bitmap.height()));
         }
     }
 #endif
     return SkPDFImage::CreateImage(bitmap, subset, encoder);
 }