diff options
author | 2015-01-27 05:39:10 -0800 | |
---|---|---|
committer | 2015-01-27 05:39:10 -0800 | |
commit | 5f213d9627d2eefa7da81cd97f36754f75eb4ae9 (patch) | |
tree | ab4712f955c73a4a8d97a9910176b12902dde642 /src/fonts/SkFontMgr_indirect.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/fonts/SkFontMgr_indirect.cpp')
-rw-r--r-- | src/fonts/SkFontMgr_indirect.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/fonts/SkFontMgr_indirect.cpp b/src/fonts/SkFontMgr_indirect.cpp index 6f94dfd367..5615a78c21 100644 --- a/src/fonts/SkFontMgr_indirect.cpp +++ b/src/fonts/SkFontMgr_indirect.cpp @@ -213,7 +213,7 @@ SkTypeface* SkFontMgr_Indirect::createTypefaceFromFontId(const SkFontIdentity& i // No exact match, but did find a data match. if (dataTypeface.get() != NULL) { - SkAutoTDelete<SkStream> stream(dataTypeface->openStream(NULL)); + SkAutoTDelete<SkStreamAsset> stream(dataTypeface->openStream(NULL)); if (stream.get() != NULL) { return fImpl->createFromStream(stream.detach(), dataTypefaceIndex); } @@ -262,7 +262,7 @@ SkTypeface* SkFontMgr_Indirect::onMatchFaceStyle(const SkTypeface* familyMember, return this->matchFamilyStyle(familyName.c_str(), fontStyle); } -SkTypeface* SkFontMgr_Indirect::onCreateFromStream(SkStream* stream, int ttcIndex) const { +SkTypeface* SkFontMgr_Indirect::onCreateFromStream(SkStreamAsset* stream, int ttcIndex) const { return fImpl->createFromStream(stream, ttcIndex); } |