src/ports/SkFontHost_FreeType.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/ports/SkFontHost_FreeType.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/ports/SkFontHost_FreeType.cpp

diff --git a/src/ports/SkFontHost_FreeType.cpp b/src/ports/SkFontHost_FreeType.cpp

index 459abbc9b800fe53a567ab910fe4eabb76c3abc1..1eff823d628502a4a142f53f2e6d31bf44f2b1d7 100644

--- a/src/ports/SkFontHost_FreeType.cpp

+++ b/src/ports/SkFontHost_FreeType.cpp

@@ -233,18 +233,15 @@ private:

///////////////////////////////////////////////////////////////////////////

struct SkFaceRec {

- SkFaceRec* fNext;

- FT_Face fFace;

- FT_StreamRec fFTStream;

- SkStream* fSkStream;

- uint32_t fRefCnt;

- uint32_t fFontID;

+ SkFaceRec* fNext;

+ FT_Face fFace;

+ FT_StreamRec fFTStream;

+ SkAutoTDelete<SkStream> fSkStream;

+ uint32_t fRefCnt;

+ uint32_t fFontID;

// assumes ownership of the stream, will call unref() when its done

bungeman-skia 2015/01/15 22:44:55 Comment, 'will delete when its done'.

scroggo 2015/01/16 19:13:37 Done.

SkFaceRec(SkStream* strm, uint32_t fontID);

- ~SkFaceRec() {

- fSkStream->unref();

- }

};

extern "C" {