Move SkPDFStream back to SkStream to save memory.

src/pdf/SkPDFStream.h

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #ifndef SkPDFStream_DEFINED
 #define SkPDFStream_DEFINED
 
 #include "SkPDFTypes.h"
 #include "SkRefCnt.h"
 #include "SkStream.h"
 #include "SkTemplates.h"
 
 class SkPDFCatalog;
 
 /** \class SkPDFStream
 
     A stream object in a PDF.  Note, all streams must be indirect objects (via
     SkObjRef).
-    TODO(vandebo): SkStream should be replaced by SkStreamRewindable when that
-    is feasible.
 */
 class SkPDFStream : public SkPDFDict {
     SK_DECLARE_INST_COUNT(SkPDFStream)
 public:
     /** Create a PDF stream. A Length entry is automatically added to the
-     *  stream dictionary. The stream may be retained (stream->ref() may be
-     *  called) so its contents must not be changed after calling this.
-     *  @param data  The data part of the stream.
+     *  stream dictionary.
+     *  @param stream The data part of the stream.  Will be duplicate()d.

[bungeman-skia, 2014/07/11 21:43:38]

This seems to want to go with the constructor below?

[hal.canary, 2014/07/12 00:58:49]

Done.

+     *  @param data   The data part of the stream.  Will be ref()ed.
      */
     explicit SkPDFStream(SkData* data);
-    /** Deprecated constructor. */
     explicit SkPDFStream(SkStream* stream);
 
     virtual ~SkPDFStream();
 
     // The SkPDFObject interface.  These two methods use a mutex to
     // allow multiple threads to call at the same time.
     virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog,
                             bool indirect);
     virtual size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
 
@@ skipping 25 matching lines @@
 
     SkPDFStream* getSubstitute() const {
         return fSubstitute.get();
     }
 
     void setData(SkData* data);
     void setData(SkStream* stream);
 
     size_t dataSize() const;
 
-    SkData* getData() const { return fData.get(); }
-
     void setState(State state) {
         fState = state;
     }
 
     State getState() const {
         return fState;
     }
 
 private:
     // Indicates what form (or if) the stream has been requested.
     State fState;
 
-    // Mutex guards fState, fData, and fSubstitute in public interface.
+    // Mutex guards fState, fDataStream, and fSubstitute in public interface.
     SkMutex fMutex;
 
-    SkAutoTUnref<SkData> fData;
+    SkMemoryStream fMemoryStream;  // Used by fDataStream when
+                                   // fDataStream needs to be backed
+                                   // by SkData.
+    SkAutoTUnref<SkStreamRewindable> fDataStream;
     SkAutoTUnref<SkPDFStream> fSubstitute;
 
     typedef SkPDFDict INHERITED;
 };
 
 #endif