| Index: src/ports/SkFontConfigInterface_direct.cpp
|
| diff --git a/src/ports/SkFontConfigInterface_direct.cpp b/src/ports/SkFontConfigInterface_direct.cpp
|
| index 124ca2a907cc633fded9f4b4fbb8d03f10cff775..0f2d882ca850919619e93de1168a283164afc971 100644
|
| --- a/src/ports/SkFontConfigInterface_direct.cpp
|
| +++ b/src/ports/SkFontConfigInterface_direct.cpp
|
| @@ -112,7 +112,7 @@ public:
|
| FontIdentity* outFontIdentifier,
|
| SkString* outFamilyName,
|
| SkTypeface::Style* outStyle) SK_OVERRIDE;
|
| - SkStream* openStream(const FontIdentity&) SK_OVERRIDE;
|
| + SkStreamAsset* openStream(const FontIdentity&) SK_OVERRIDE;
|
|
|
| // new APIs
|
| SkDataTable* getFamilyNames() SK_OVERRIDE;
|
| @@ -552,7 +552,7 @@ bool SkFontConfigInterfaceDirect::matchFamilyName(const char familyName[],
|
| return true;
|
| }
|
|
|
| -SkStream* SkFontConfigInterfaceDirect::openStream(const FontIdentity& identity) {
|
| +SkStreamAsset* SkFontConfigInterfaceDirect::openStream(const FontIdentity& identity) {
|
| return SkStream::NewFromFile(identity.fString.c_str());
|
| }
|
|
|
|
|