| Index: src/core/SkFontMgr.cpp
|
| diff --git a/src/core/SkFontMgr.cpp b/src/core/SkFontMgr.cpp
|
| index 71289a67a6a0beb7dcffdc2d776b447b42ed4919..4e0f549896c58abde1bcd7854eb48202b0381cdf 100644
|
| --- a/src/core/SkFontMgr.cpp
|
| +++ b/src/core/SkFontMgr.cpp
|
| @@ -68,7 +68,7 @@ protected:
|
| SkTypeface* onCreateFromData(SkData*, int) const SK_OVERRIDE {
|
| return NULL;
|
| }
|
| - SkTypeface* onCreateFromStream(SkStream* stream, int) const SK_OVERRIDE {
|
| + SkTypeface* onCreateFromStream(SkStreamAsset* stream, int) const SK_OVERRIDE {
|
| SkDELETE(stream);
|
| return NULL;
|
| }
|
| @@ -126,7 +126,7 @@ SkTypeface* SkFontMgr::createFromData(SkData* data, int ttcIndex) const {
|
| return this->onCreateFromData(data, ttcIndex);
|
| }
|
|
|
| -SkTypeface* SkFontMgr::createFromStream(SkStream* stream, int ttcIndex) const {
|
| +SkTypeface* SkFontMgr::createFromStream(SkStreamAsset* stream, int ttcIndex) const {
|
| if (NULL == stream) {
|
| return NULL;
|
| }
|
|
|