From a1193e4b0e34a7e4e1bd33e9708d7341679f8321 Mon Sep 17 00:00:00 2001 From: scroggo Date: Wed, 21 Jan 2015 12:09:53 -0800 Subject: 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 SkAutoTUnrefs to SkAutoTDeletes. 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 --- src/sfnt/SkOTUtils.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'src/sfnt') diff --git a/src/sfnt/SkOTUtils.h b/src/sfnt/SkOTUtils.h index 51781b40cd..691bd76d51 100644 --- a/src/sfnt/SkOTUtils.h +++ b/src/sfnt/SkOTUtils.h @@ -33,6 +33,8 @@ struct SkOTUtils { * UnicodeBMPUCS2, and English_UnitedStates settings. * * fontName and fontNameLen must be specified in terms of ASCII chars. + * + * Does not affect fontData's ownership. */ static SkData* RenameFont(SkStream* fontData, const char* fontName, int fontNameLen); -- cgit v1.2.3