Make SkStream *not* ref counted.
SkStream is a stateful object, so it does not make sense for it to have
multiple owners. Make SkStream inherit directly from SkNoncopyable.
Update methods which previously called SkStream::ref() (e.g.
SkImageDecoder::buildTileIndex() and SkFrontBufferedStream::Create(),
which required the existing owners to call SkStream::unref()) to take
ownership of their SkStream parameters and delete when done (including
on failure).
Switch all SkAutoTUnref<SkStream>s to SkAutoTDelete<SkStream>s. In some
cases this means heap allocating streams that were previously stack
allocated.
Respect ownership rules of SkTypeface::CreateFromStream() and
SkImageDecoder::buildTileIndex().
Update the comments for exceptional methods which do not affect the
ownership of their SkStream parameters (e.g.
SkPicture::CreateFromStream() and SkTypeface::Deserialize()) to be
explicit about ownership.
Remove test_stream_life, which tested that buildTileIndex() behaved
correctly when SkStream was a ref counted object. The test does not
make sense now that it is not.
In SkPDFStream, remove the SkMemoryStream member. Instead of using it,
create a new SkMemoryStream to pass to fDataStream (which is now an
SkAutoTDelete).
Make other pdf rasterizers behave like SkPDFDocumentToBitmap.
SkPDFDocumentToBitmap delete the SkStream, so do the same in the
following pdf rasterizers:
SkPopplerRasterizePDF
SkNativeRasterizePDF
SkNoRasterizePDF
Requires a change to Android, which currently treats SkStreams as ref
counted objects.
Review URL: https://codereview.chromium.org/849103004
diff --git a/src/images/SkDecodingImageGenerator.cpp b/src/images/SkDecodingImageGenerator.cpp
index baa112c..e7a775e 100644
--- a/src/images/SkDecodingImageGenerator.cpp
+++ b/src/images/SkDecodingImageGenerator.cpp
@@ -24,11 +24,11 @@
public:
virtual ~DecodingImageGenerator();
- SkData* fData;
- SkStreamRewindable* fStream;
- const SkImageInfo fInfo;
- const int fSampleSize;
- const bool fDitherImage;
+ SkData* fData;
+ SkAutoTDelete<SkStreamRewindable> fStream;
+ const SkImageInfo fInfo;
+ const int fSampleSize;
+ const bool fDitherImage;
DecodingImageGenerator(SkData* data,
SkStreamRewindable* stream,
@@ -128,7 +128,6 @@
DecodingImageGenerator::~DecodingImageGenerator() {
SkSafeUnref(fData);
- fStream->unref();
}
SkData* DecodingImageGenerator::onRefEncodedData() {
@@ -227,7 +226,7 @@
SkStreamRewindable* stream,
const SkDecodingImageGenerator::Options& opts) {
SkASSERT(stream);
- SkAutoTUnref<SkStreamRewindable> autoStream(stream); // always unref this.
+ SkAutoTDelete<SkStreamRewindable> autoStream(stream); // always delete this
SkAssertResult(autoStream->rewind());
SkAutoTDelete<SkImageDecoder> decoder(SkImageDecoder::Factory(autoStream));
if (NULL == decoder.get()) {
@@ -280,7 +279,6 @@
}
SkStreamRewindable* stream = SkNEW_ARGS(SkMemoryStream, (data));
SkASSERT(stream != NULL);
- SkASSERT(stream->unique());
return CreateDecodingImageGenerator(data, stream, opts);
}
@@ -288,9 +286,7 @@
SkStreamRewindable* stream,
const SkDecodingImageGenerator::Options& opts) {
SkASSERT(stream != NULL);
- SkASSERT(stream->unique());
- if ((stream == NULL) || !stream->unique()) {
- SkSafeUnref(stream);
+ if (stream == NULL) {
return NULL;
}
return CreateDecodingImageGenerator(NULL, stream, opts);
diff --git a/src/images/SkImageDecoder.cpp b/src/images/SkImageDecoder.cpp
index 596d05e..89a4705 100644
--- a/src/images/SkImageDecoder.cpp
+++ b/src/images/SkImageDecoder.cpp
@@ -158,6 +158,13 @@
return this->onBuildTileIndex(stream, width, height);
}
+bool SkImageDecoder::onBuildTileIndex(SkStreamRewindable* stream, int* /*width*/,
+ int* /*height*/) {
+ SkDELETE(stream);
+ return false;
+}
+
+
bool SkImageDecoder::cropBitmap(SkBitmap *dst, SkBitmap *src, int sampleSize,
int dstX, int dstY, int width, int height,
int srcX, int srcY) {
@@ -212,7 +219,7 @@
SkASSERT(file);
SkASSERT(bm);
- SkAutoTUnref<SkStreamRewindable> stream(SkStream::NewFromFile(file));
+ SkAutoTDelete<SkStreamRewindable> stream(SkStream::NewFromFile(file));
if (stream.get()) {
if (SkImageDecoder::DecodeStream(stream, bm, pref, mode, format)) {
bm->pixelRef()->setURI(file);
diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp
index 8c9d267..e0722e1 100644
--- a/src/images/SkImageDecoder_libjpeg.cpp
+++ b/src/images/SkImageDecoder_libjpeg.cpp
@@ -105,8 +105,10 @@
#ifdef SK_BUILD_FOR_ANDROID
class SkJPEGImageIndex {
public:
+ // Takes ownership of stream.
SkJPEGImageIndex(SkStreamRewindable* stream, SkImageDecoder* decoder)
: fSrcMgr(stream, decoder)
+ , fStream(stream)
, fInfoInitialized(false)
, fHuffmanCreated(false)
, fDecompressStarted(false)
@@ -206,6 +208,7 @@
private:
skjpeg_source_mgr fSrcMgr;
+ SkAutoTDelete<SkStream> fStream;
jpeg_decompress_struct fCInfo;
huffman_index fHuffmanIndex;
bool fInfoInitialized;
diff --git a/src/images/SkImageDecoder_libpng.cpp b/src/images/SkImageDecoder_libpng.cpp
index c3bba6e..f9ef6b7 100644
--- a/src/images/SkImageDecoder_libpng.cpp
+++ b/src/images/SkImageDecoder_libpng.cpp
@@ -53,13 +53,13 @@
class SkPNGImageIndex {
public:
+ // Takes ownership of stream.
SkPNGImageIndex(SkStreamRewindable* stream, png_structp png_ptr, png_infop info_ptr)
: fStream(stream)
, fPng_ptr(png_ptr)
, fInfo_ptr(info_ptr)
, fColorType(kUnknown_SkColorType) {
SkASSERT(stream != NULL);
- stream->ref();
}
~SkPNGImageIndex() {
if (fPng_ptr) {
@@ -67,7 +67,7 @@
}
}
- SkAutoTUnref<SkStreamRewindable> fStream;
+ SkAutoTDelete<SkStreamRewindable> fStream;
png_structp fPng_ptr;
png_infop fInfo_ptr;
SkColorType fColorType;
@@ -718,6 +718,7 @@
#ifdef SK_BUILD_FOR_ANDROID
bool SkPNGImageDecoder::onBuildTileIndex(SkStreamRewindable* sk_stream, int *width, int *height) {
+ SkAutoTDelete<SkStreamRewindable> streamDeleter(sk_stream);
png_structp png_ptr;
png_infop info_ptr;
@@ -743,7 +744,7 @@
if (fImageIndex) {
SkDELETE(fImageIndex);
}
- fImageIndex = SkNEW_ARGS(SkPNGImageIndex, (sk_stream, png_ptr, info_ptr));
+ fImageIndex = SkNEW_ARGS(SkPNGImageIndex, (streamDeleter.detach(), png_ptr, info_ptr));
return true;
}
diff --git a/src/images/SkImageDecoder_libwebp.cpp b/src/images/SkImageDecoder_libwebp.cpp
index c56933d..5ac647a 100644
--- a/src/images/SkImageDecoder_libwebp.cpp
+++ b/src/images/SkImageDecoder_libwebp.cpp
@@ -95,14 +95,10 @@
class SkWEBPImageDecoder: public SkImageDecoder {
public:
SkWEBPImageDecoder() {
- fInputStream = NULL;
fOrigWidth = 0;
fOrigHeight = 0;
fHasAlpha = 0;
}
- virtual ~SkWEBPImageDecoder() {
- SkSafeUnref(fInputStream);
- }
Format getFormat() const SK_OVERRIDE {
return kWEBP_Format;
@@ -125,7 +121,7 @@
bool setDecodeConfig(SkBitmap* decodedBitmap, int width, int height);
- SkStream* fInputStream;
+ SkAutoTDelete<SkStream> fInputStream;
int fOrigWidth;
int fOrigHeight;
int fHasAlpha;
@@ -316,6 +312,7 @@
bool SkWEBPImageDecoder::onBuildTileIndex(SkStreamRewindable* stream,
int *width, int *height) {
+ SkAutoTDelete<SkStreamRewindable> streamDeleter(stream);
int origWidth, origHeight, hasAlpha;
if (!webp_parse_header(stream, &origWidth, &origHeight, &hasAlpha)) {
return false;
@@ -329,7 +326,7 @@
*width = origWidth;
*height = origHeight;
- SkRefCnt_SafeAssign(this->fInputStream, stream);
+ this->fInputStream.reset(streamDeleter.detach());
this->fOrigWidth = origWidth;
this->fOrigHeight = origHeight;
this->fHasAlpha = hasAlpha;
diff --git a/src/images/SkJpegUtility.cpp b/src/images/SkJpegUtility.cpp
index e17b55b..937c5ec 100644
--- a/src/images/SkJpegUtility.cpp
+++ b/src/images/SkJpegUtility.cpp
@@ -96,7 +96,7 @@
///////////////////////////////////////////////////////////////////////////////
skjpeg_source_mgr::skjpeg_source_mgr(SkStream* stream, SkImageDecoder* decoder)
- : fStream(SkRef(stream))
+ : fStream(stream)
, fDecoder(decoder) {
init_source = sk_init_source;
@@ -110,10 +110,6 @@
// SkDebugf("**************** use memorybase %p %d\n", fMemoryBase, fMemoryBaseSize);
}
-skjpeg_source_mgr::~skjpeg_source_mgr() {
- SkSafeUnref(fStream);
-}
-
///////////////////////////////////////////////////////////////////////////////
static void sk_init_destination(j_compress_ptr cinfo) {
diff --git a/src/images/SkJpegUtility.h b/src/images/SkJpegUtility.h
index 69092ef..1a763f8 100644
--- a/src/images/SkJpegUtility.h
+++ b/src/images/SkJpegUtility.h
@@ -35,9 +35,8 @@
*/
struct skjpeg_source_mgr : jpeg_source_mgr {
skjpeg_source_mgr(SkStream* stream, SkImageDecoder* decoder);
- ~skjpeg_source_mgr();
- // fStream is ref'ed and unref'ed
+ // Unowned.
SkStream* fStream;
// Unowned pointer to the decoder, used to check if the decoding process
// has been cancelled.
diff --git a/src/images/SkMovie.cpp b/src/images/SkMovie.cpp
index 9a2a71c..2a1339f 100644
--- a/src/images/SkMovie.cpp
+++ b/src/images/SkMovie.cpp
@@ -90,6 +90,6 @@
}
SkMovie* SkMovie::DecodeFile(const char path[]) {
- SkAutoTUnref<SkStreamRewindable> stream(SkStream::NewFromFile(path));
+ SkAutoTDelete<SkStreamRewindable> stream(SkStream::NewFromFile(path));
return stream.get() ? SkMovie::DecodeStream(stream) : NULL;
}