diff options
Diffstat (limited to 'src/ports/SkFontHost_win.cpp')
-rwxr-xr-x | src/ports/SkFontHost_win.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/ports/SkFontHost_win.cpp b/src/ports/SkFontHost_win.cpp index 70f3ddfdf8..a1d92fc216 100755 --- a/src/ports/SkFontHost_win.cpp +++ b/src/ports/SkFontHost_win.cpp @@ -255,7 +255,7 @@ public: } protected: - SkStream* onOpenStream(int* ttcIndex) const SK_OVERRIDE; + SkStreamAsset* onOpenStream(int* ttcIndex) const SK_OVERRIDE; SkScalerContext* onCreateScalerContext(const SkDescriptor*) const SK_OVERRIDE; void onFilterRec(SkScalerContextRec*) const SK_OVERRIDE; virtual SkAdvancedTypefaceMetrics* onGetAdvancedTypefaceMetrics( @@ -1925,7 +1925,7 @@ static HANDLE activate_font(SkData* fontData) { } // Does not affect ownership of stream. -static SkTypeface* create_from_stream(SkStream* stream) { +static SkTypeface* create_from_stream(SkStreamAsset* stream) { // Create a unique and unpredictable font name. // Avoids collisions and access from CSS. char familyName[BASE64_GUID_ID_LEN]; @@ -1953,7 +1953,7 @@ static SkTypeface* create_from_stream(SkStream* stream) { return SkCreateFontMemResourceTypefaceFromLOGFONT(lf, fontReference); } -SkStream* LogFontTypeface::onOpenStream(int* ttcIndex) const { +SkStreamAsset* LogFontTypeface::onOpenStream(int* ttcIndex) const { *ttcIndex = 0; const DWORD kTTCTag = @@ -2481,8 +2481,8 @@ protected: return this->matchFamilyStyle(familyName.c_str(), fontstyle); } - SkTypeface* onCreateFromStream(SkStream* stream, int ttcIndex) const SK_OVERRIDE { - SkAutoTDelete<SkStream> streamDeleter(stream); + SkTypeface* onCreateFromStream(SkStreamAsset* bareStream, int ttcIndex) const SK_OVERRIDE { + SkAutoTDelete<SkStreamAsset> stream(bareStream); return create_from_stream(stream); } |