SkPDF: PDFStream has-a not is-a PDFDict

src/pdf/SkPDFTypes.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 SkPDFTypes_DEFINED
 #define SkPDFTypes_DEFINED
 
 #include "SkRefCnt.h"
 #include "SkScalar.h"
 #include "SkTHash.h"
 #include "SkTypes.h"
 
+class SkData;
 class SkPDFObjNumMap;
 class SkPDFObject;
 class SkPDFSubstituteMap;
 class SkStreamAsset;
 class SkString;
 class SkWStream;
 
 #ifdef SK_PDF_IMAGE_STATS
 #include "SkAtomics.h"
 #endif
@@ skipping 273 matching lines @@
 
 /** \class SkPDFSharedStream
 
     This class takes an asset and assumes that it is backed by
     long-lived shared data (for example, an open file
     descriptor). That is: no memory savings can be made by holding on
     to a compressed version instead.
  */
 class SkPDFSharedStream final : public SkPDFObject {
 public:
-    // Takes ownership of asset.
-    SkPDFSharedStream(SkStreamAsset* data);
+    SkPDFSharedStream(std::unique_ptr<SkStreamAsset> data);
     ~SkPDFSharedStream();
-    SkPDFDict* dict() { return fDict.get(); }
+    SkPDFDict* dict() { return &fDict; }
     void emitObject(SkWStream*,
                     const SkPDFObjNumMap&,
                     const SkPDFSubstituteMap&) const override;
     void addResources(SkPDFObjNumMap*,
                       const SkPDFSubstituteMap&) const override;
     void drop() override;
 
 private:
     std::unique_ptr<SkStreamAsset> fAsset;
-    sk_sp<SkPDFDict> fDict;
-    SkDEBUGCODE(bool fDumped;)
+    SkPDFDict fDict;
     typedef SkPDFObject INHERITED;
 };
 
+/** \class SkPDFSharedStream

[tomhudson, 2016/07/29 16:06:05]

name in comment doesn't match name of class?

[hal.canary, 2016/07/29 16:31:29]

Done.

+
+    This class takes an asset and assumes that it is the only owner of
+    the asset's data.  It immediately compresses the asset to save
+    memory.
+ */
+
+class SkPDFStream : public SkPDFObject {
+
+public:
+    /** Create a PDF stream. A Length entry is automatically added to the
+     *  stream dictionary.
+     *  @param data   The data part of the stream.
+     *  @param stream The data part of the stream. */
+    explicit SkPDFStream(sk_sp<SkData> data);
+    explicit SkPDFStream(std::unique_ptr<SkStreamAsset> stream);
+    virtual ~SkPDFStream();
+
+    SkPDFDict* dict() { return &fDict; }
+
+    // The SkPDFObject interface.
+    void emitObject(SkWStream* stream,
+                    const SkPDFObjNumMap& objNumMap,
+                    const SkPDFSubstituteMap& substitutes) const override;
+    void addResources(SkPDFObjNumMap*, const SkPDFSubstituteMap&) const final;
+    void drop() override;
+
+protected:
+    /* Create a PDF stream with no data.  The setData method must be called to
+     * set the data. */
+    SkPDFStream();
+
+    /** Only call this function once. */
+    void setData(std::unique_ptr<SkStreamAsset> stream);
+
+private:
+    std::unique_ptr<SkStreamAsset> fCompressedData;
+    SkPDFDict fDict;
+
+    typedef SkPDFDict INHERITED;
+};
+
 ////////////////////////////////////////////////////////////////////////////////
 
 /** \class SkPDFObjNumMap
 
     The PDF Object Number Map manages object numbers.  It is used to
     create the PDF cross reference table.
 */
 class SkPDFObjNumMap : SkNoncopyable {
 public:
     /** Add the passed object to the catalog.
@@ skipping 49 matching lines @@
 };
 
 #ifdef SK_PDF_IMAGE_STATS
 extern SkAtomic<int> gDrawImageCalls;
 extern SkAtomic<int> gJpegImageObjects;
 extern SkAtomic<int> gRegularImageObjects;
 extern void SkPDFImageDumpStats();
 #endif // SK_PDF_IMAGE_STATS
 
 #endif