Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(124)

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: Rebase, just in case. 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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkFontDescriptor.h ('k') | src/core/SkPaint.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkFontMgr.cpp
diff --git a/src/core/SkFontMgr.cpp b/src/core/SkFontMgr.cpp
index ca29e293efb1c5e606aef198dae217bda5a0616a..71289a67a6a0beb7dcffdc2d776b447b42ed4919 100644
--- a/src/core/SkFontMgr.cpp
+++ b/src/core/SkFontMgr.cpp
@@ -7,10 +7,10 @@
#include "SkFontMgr.h"
#include "SkLazyPtr.h"
+#include "SkStream.h"
#include "SkTypes.h"
class SkFontStyle;
-class SkStream;
class SkTypeface;
class SkEmptyFontStyleSet : public SkFontStyleSet {
@@ -68,7 +68,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 »

Powered by Google App Engine
This is Rietveld 408576698