diff options
author | 2015-01-27 05:39:10 -0800 | |
---|---|---|
committer | 2015-01-27 05:39:10 -0800 | |
commit | 5f213d9627d2eefa7da81cd97f36754f75eb4ae9 (patch) | |
tree | ab4712f955c73a4a8d97a9910176b12902dde642 /src/ports/SkFontConfigInterface_direct.cpp | |
parent | dc14fa4ec7739465d9bb9dbf1f0e537c80ad867f (diff) |
SkTypeface to use SkStreamAsset.
SkTypeface already requires typeface streams to support SkStreamAsset
in practice, and in practice all users are already supplying them.
Review URL: https://codereview.chromium.org/869763002
Diffstat (limited to 'src/ports/SkFontConfigInterface_direct.cpp')
-rw-r--r-- | src/ports/SkFontConfigInterface_direct.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ports/SkFontConfigInterface_direct.cpp b/src/ports/SkFontConfigInterface_direct.cpp index 124ca2a907..0f2d882ca8 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()); } |