diff options
author | scroggo <scroggo@google.com> | 2015-01-21 12:09:53 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-21 12:09:53 -0800 |
commit | a1193e4b0e34a7e4e1bd33e9708d7341679f8321 (patch) | |
tree | e63e73eeadfd6d979e81596804e34e7af8fa0390 /src/core/SkPictureData.h | |
parent | fd1ad48d4d9073b90f58e60219637046a8446267 (diff) |
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
Diffstat (limited to 'src/core/SkPictureData.h')
-rw-r--r-- | src/core/SkPictureData.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/SkPictureData.h b/src/core/SkPictureData.h index ab78f8a313..cada8d1f66 100644 --- a/src/core/SkPictureData.h +++ b/src/core/SkPictureData.h @@ -58,6 +58,7 @@ struct SkPictInfo { class SkPictureData { public: SkPictureData(const SkPictureRecord& record, const SkPictInfo&, bool deepCopyOps); + // Does not affect ownership of SkStream. static SkPictureData* CreateFromStream(SkStream*, const SkPictInfo&, SkPicture::InstallPixelRefProc); @@ -79,6 +80,7 @@ public: protected: explicit SkPictureData(const SkPictInfo& info); + // Does not affect ownership of SkStream. bool parseStream(SkStream*, SkPicture::InstallPixelRefProc); bool parseBuffer(SkReadBuffer& buffer); @@ -135,6 +137,7 @@ private: void init(); // these help us with reading/writing + // Does not affect ownership of SkStream. bool parseStreamTag(SkStream*, uint32_t tag, uint32_t size, SkPicture::InstallPixelRefProc); bool parseBufferTag(SkReadBuffer&, uint32_t tag, uint32_t size); void flattenToBuffer(SkWriteBuffer&) const; |