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
 #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 {

[mtklein, 2014/06/26 13:21:59]

Now that there's a mutex involved, we need to document what's thread safe and
what's not.  Can we tack const onto any of these methods?

[hal.canary, 2014/06/26 18:42:02]

nothing is const.  I note that the emitObject and getOutputSize public methods
are thread-safe.

     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.
      */
     explicit SkPDFStream(SkData* data);
     /** Deprecated constructor. */
     explicit SkPDFStream(SkStream* stream);
@@ skipping 29 matching lines @@
         fSubstitute.reset(stream);
     }
 
     SkPDFStream* getSubstitute() {
         return fSubstitute.get();
     }
 
     void setData(SkData* data);
     void setData(SkStream* stream);
 
-    SkStream* getData() {
-        return fData.get();
-    }
+    size_t dataSize();
+
+    SkData* getData() { return fData.get(); }
 
     void setState(State state) {
         fState = state;
     }
 
     State getState() {
         return fState;
     }
 
 private:
     // Indicates what form (or if) the stream has been requested.
     State fState;
 
-    // TODO(vandebo): Use SkData (after removing deprecated constructor).
-    SkAutoTUnref<SkStream> fData;
+    SkMutex fMutex;

[mtklein, 2014/06/26 13:21:59]

It's nice to note which fields this guards.  // Guards all fields  is fine if
that's true.

[hal.canary, 2014/06/26 18:42:02]

Done.

+
+    SkAutoTUnref<SkData> fData;
     SkAutoTUnref<SkPDFStream> fSubstitute;
 
     typedef SkPDFDict INHERITED;
 };
 
 #endif