src/images/SkImageDecoder_libjpeg.cpp - Issue 849103004: Make SkStream *not* ref counted.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: src/images/SkImageDecoder_libjpeg.cpp

Issue 849103004: Make SkStream *not* ref counted. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Treat SkFontMgr::createFromStream as taking ownership of the stream (is this correct?) Created 5 years, 11 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: src/images/SkImageDecoder_libjpeg.cpp

diff --git a/src/images/SkImageDecoder_libjpeg.cpp b/src/images/SkImageDecoder_libjpeg.cpp

index 8c9d26783ca40c82ab4be6ae7d5fc0569d2bdf65..e0722e18dc60972719d2634fa06c48dd58070b4e 100644

--- a/src/images/SkImageDecoder_libjpeg.cpp

+++ b/src/images/SkImageDecoder_libjpeg.cpp

@@ -105,8 +105,10 @@ static void initialize_info(jpeg_decompress_struct* cinfo, skjpeg_source_mgr* sr

#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 @@ public:

private:

skjpeg_source_mgr fSrcMgr;

+ SkAutoTDelete<SkStream> fStream;

jpeg_decompress_struct fCInfo;

huffman_index fHuffmanIndex;

bool fInfoInitialized;