Simplify reference management in SkPDF

src/pdf/SkPDFImage.h

 
 /*
  * 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.
  */
 
 
 #ifndef SkPDFImage_DEFINED
@@ skipping 36 matching lines @@
      *  @param paint    Used to calculate alpha, masks, etc.
      *  @return  The image XObject or NUll if there is nothing to draw for
      *           the given parameters.
      */
     static SkPDFImage* CreateImage(const SkBitmap& bitmap,
                                    const SkIRect& srcRect,
                                    SkPicture::EncodeBitmap encoder);
 
     virtual ~SkPDFImage();
 
-    /** Add a Soft Mask (alpha or shape channel) to the image.  Refs mask.
-     *  @param mask A gray scale image representing the mask.
-     *  @return The mask argument is returned.
-     */
-    SkPDFImage* addSMask(SkPDFImage* mask);
-
     bool isEmpty() {
         return fSrcRect.isEmpty();
     }
 
-    // The SkPDFObject interface.
-    virtual void getResources(const SkTSet<SkPDFObject*>& knownResourceObjects,
-                              SkTSet<SkPDFObject*>* newResourceObjects);
-
 private:
     SkBitmap fBitmap;
     bool fIsAlpha;
     SkIRect fSrcRect;
     SkPicture::EncodeBitmap fEncoder;
     bool fStreamValid;
 
-    SkTDArray<SkPDFObject*> fResources;
-
     /** Create a PDF image XObject. Entries for the image properties are
      *  automatically added to the stream dictionary.
      *  @param stream     The image stream. May be NULL. Otherwise, this
      *                    (instead of the input bitmap) will be used as the
      *                    PDF's content stream, possibly with lossless encoding.
      *                    Will be duplicated, and left in indeterminate state.
      *  @param bitmap     The image. If a stream is not given, its color data
      *                    will be used as the image. If a stream is given, this
      *                    is used for configuration only.
      *  @param isAlpha    Whether or not this is the alpha of an image.
@@ skipping 11 matching lines @@
     SkPDFImage(SkPDFImage& pdfImage);
 
     // Populate the stream dictionary.  This method returns false if
     // fSubstitute should be used.
     virtual bool populate(SkPDFCatalog* catalog);
 
     typedef SkPDFStream INHERITED;
 };
 
 #endif