| Index: src/ports/SkFontMgr_win_dw.cpp
|
| diff --git a/src/ports/SkFontMgr_win_dw.cpp b/src/ports/SkFontMgr_win_dw.cpp
|
| index 31c1d3fef424636bcac21174debeeed5d9ef251e..bb1e8f572f0920fc51e4542d75160b97f905b17f 100644
|
| --- a/src/ports/SkFontMgr_win_dw.cpp
|
| +++ b/src/ports/SkFontMgr_win_dw.cpp
|
| @@ -276,7 +276,7 @@ protected:
|
| SkUnichar character) const SK_OVERRIDE;
|
| virtual SkTypeface* onMatchFaceStyle(const SkTypeface* familyMember,
|
| const SkFontStyle& fontstyle) const SK_OVERRIDE;
|
| - SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE;
|
| + SkTypeface* onCreateFromStream(SkStreamAsset* stream, int ttcIndex) const SK_OVERRIDE;
|
| SkTypeface* onCreateFromData(SkData* data, int ttcIndex) const SK_OVERRIDE;
|
| SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const SK_OVERRIDE;
|
| virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],
|
| @@ -534,7 +534,7 @@ private:
|
| T* fUnregister;
|
| };
|
|
|
| -SkTypeface* SkFontMgr_DirectWrite::onCreateFromStream(SkStream* stream, int ttcIndex) const {
|
| +SkTypeface* SkFontMgr_DirectWrite::onCreateFromStream(SkStreamAsset* stream, int ttcIndex) const {
|
| SkTScopedComPtr<StreamFontFileLoader> fontFileLoader;
|
| // This transfers ownership of stream to the new object.
|
| HRN(StreamFontFileLoader::Create(stream, &fontFileLoader));
|
|
|