| Index: src/ports/SkFontMgr_fontconfig.cpp
|
| diff --git a/src/ports/SkFontMgr_fontconfig.cpp b/src/ports/SkFontMgr_fontconfig.cpp
|
| index b5e4eaed647fa8d36526dba65b73ec1c002bb8ca..ad490032c1a489725b4ac7156b855b4312b94334 100644
|
| --- a/src/ports/SkFontMgr_fontconfig.cpp
|
| +++ b/src/ports/SkFontMgr_fontconfig.cpp
|
| @@ -397,7 +397,7 @@ public:
|
| }
|
|
|
| private:
|
| - SkAutoTUnref<SkStreamAsset> fStream;
|
| + SkAutoTDelete<SkStreamAsset> fStream;
|
| int fIndex;
|
|
|
| typedef SkTypeface_FreeType INHERITED;
|
| @@ -827,13 +827,11 @@ protected:
|
| }
|
|
|
| SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE {
|
| - SkAutoTUnref<SkStreamAsset> stream(SkNEW_ARGS(SkMemoryStream, (data)));
|
| - return this->createFromStream(stream, ttcIndex);
|
| + return this->createFromStream(SkNEW_ARGS(SkMemoryStream, (data)), ttcIndex);
|
| }
|
|
|
| SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE {
|
| - SkAutoTUnref<SkStreamAsset> stream(SkStream::NewFromFile(path));
|
| - return this->createFromStream(stream, ttcIndex);
|
| + return this->createFromStream(SkStream::NewFromFile(path), ttcIndex);
|
| }
|
|
|
| virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],
|
|
|