Index: src/ports/SkFontMgr_win_dw.cpp |
diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp |
index e7ea980872186bd6a4b326de2d225c3cb7fc57da..730beab3a7ec06c5ef2ed6375737f17da8fbeb7e 100644 |
--- a/src/ports/SkFontMgr_win_dw.cpp |
+++ b/src/ports/SkFontMgr_win_dw.cpp |
@@ -42,10 +42,10 @@ public: |
return S_OK; |
} |
- SkAutoTUnref<SkStream> fStream; |
+ SkAutoTDelete<SkStream> fStream; |
private: |
- StreamFontFileLoader(SkStream* stream) : fRefCount(1), fStream(SkRef(stream)) { } |
+ StreamFontFileLoader(SkStream* stream) : fRefCount(1), fStream(stream) { } |
virtual ~StreamFontFileLoader() { } |
ULONG fRefCount; |
@@ -580,13 +580,11 @@ SkTypeface* SkFontMgr_DirectWrite::onCreateFromStream(SkStream* stream, int ttcI |
} |
SkTypeface* SkFontMgr_DirectWrite::onCreateFromData(SkData* data, int ttcIndex) const { |
- SkAutoTUnref<SkStream> stream(SkNEW_ARGS(SkMemoryStream, (data))); |
- return this->createFromStream(stream, ttcIndex); |
+ return this->createFromStream(SkNEW_ARGS(SkMemoryStream, (data)), ttcIndex); |
} |
SkTypeface* SkFontMgr_DirectWrite::onCreateFromFile(const char path[], int ttcIndex) const { |
- SkAutoTUnref<SkStream> stream(SkStream::NewFromFile(path)); |
- return this->createFromStream(stream, ttcIndex); |
+ return this->createFromStream(SkStream::NewFromFile(path), ttcIndex); |
} |
HRESULT SkFontMgr_DirectWrite::getByFamilyName(const WCHAR wideFamilyName[], |