Revert of Switch SkPDFStream's internal storage from SkStream to SkData

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
@@ skipping 23 matching lines @@
      */
     explicit SkPDFStream(SkData* data);
     /** Deprecated constructor. */
     explicit SkPDFStream(SkStream* stream);
     /** Create a PDF stream with the same content and dictionary entries
      *  as the passed one.
      */
     explicit SkPDFStream(const SkPDFStream& pdfStream);
     virtual ~SkPDFStream();
 
-    // The SkPDFObject interface.  These two methods use a mutex to
-    // allow multiple threads to call at the same time.
+    // The SkPDFObject interface.
     virtual void emitObject(SkWStream* stream, SkPDFCatalog* catalog,
                             bool indirect);
     virtual size_t getOutputSize(SkPDFCatalog* catalog, bool indirect);
 
 protected:
     enum State {
         kUnused_State,         //!< The stream hasn't been requested yet.
         kNoCompression_State,  //!< The stream's been requested in an
                                //   uncompressed form.
         kCompressed_State,     //!< The stream's already been compressed.
     };
 
     /* Create a PDF stream with no data.  The setData method must be called to
      * set the data.
      */
     SkPDFStream();
 
     // Populate the stream dictionary.  This method returns false if
     // fSubstitute should be used.
     virtual bool populate(SkPDFCatalog* catalog);
 
     void setSubstitute(SkPDFStream* stream) {
         fSubstitute.reset(stream);
     }
 
-    SkPDFStream* getSubstitute() const {
+    SkPDFStream* getSubstitute() {
         return fSubstitute.get();
     }
 
     void setData(SkData* data);
     void setData(SkStream* stream);
 
-    size_t dataSize() const;
-
-    SkData* getData() const { return fData.get(); }
+    SkStream* getData() {
+        return fData.get();
+    }
 
     void setState(State state) {
         fState = state;
     }
 
-    State getState() const {
+    State getState() {
         return fState;
     }
 
 private:
     // Indicates what form (or if) the stream has been requested.
     State fState;
 
-    // Mutex guards fState, fData, and fSubstitute in public interface.
-    SkMutex fMutex;
-
-    SkAutoTUnref<SkData> fData;
+    // TODO(vandebo): Use SkData (after removing deprecated constructor).
+    SkAutoTUnref<SkStream> fData;
     SkAutoTUnref<SkPDFStream> fSubstitute;
 
     typedef SkPDFDict INHERITED;
 };
 
 #endif