src/core/SkFontMgr.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/core/SkFontMgr.cpp

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

Patch Set: Delete streams in onCreateFromStream failures. 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/core/SkFontMgr.cpp

diff --git a/src/core/SkFontMgr.cpp b/src/core/SkFontMgr.cpp

index ca29e293efb1c5e606aef198dae217bda5a0616a..c487efa09a0ecce74303bfddea3ba7ecb7b1edc1 100644

--- a/src/core/SkFontMgr.cpp

+++ b/src/core/SkFontMgr.cpp

@@ -7,6 +7,7 @@

#include "SkFontMgr.h"

#include "SkLazyPtr.h"

+#include "SkStream.h"

#include "SkTypes.h"

class SkFontStyle;

@@ -68,7 +69,8 @@ protected:

SkTypeface* onCreateFromData(SkData*, int) const SK_OVERRIDE {

return NULL;

}

- SkTypeface* onCreateFromStream(SkStream*, int) const SK_OVERRIDE {

+ SkTypeface* onCreateFromStream(SkStream* stream, int) const SK_OVERRIDE {

+ SkDELETE(stream);

return NULL;

}

SkTypeface* onCreateFromFile(const char[], int) const SK_OVERRIDE {

« no previous file with comments | « src/core/SkFontDescriptor.h ('k') | src/core/SkPaint.cpp » ('j') | no next file with comments »