aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core/SkFontMgr.cpp
diff options
context:
space:
mode:
authorGravatar bungeman <bungeman@google.com>2016-01-21 14:17:47 -0800
committerGravatar Commit bot <commit-bot@chromium.org>2016-01-21 14:17:47 -0800
commitf6c7107d0385cc2b556802354b93b7dcff61570d (patch)
tree6acc6e0ae4621e2bbc6deb43c3198a73c5d56433 /src/core/SkFontMgr.cpp
parent27a6e86fb17fce7ce962b9080eae36926e87d568 (diff)
Expose API for gx font variation axes.
Diffstat (limited to 'src/core/SkFontMgr.cpp')
-rw-r--r--src/core/SkFontMgr.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/core/SkFontMgr.cpp b/src/core/SkFontMgr.cpp
index 5246916463..ab04250c03 100644
--- a/src/core/SkFontMgr.cpp
+++ b/src/core/SkFontMgr.cpp
@@ -132,6 +132,13 @@ SkTypeface* SkFontMgr::createFromStream(SkStreamAsset* stream, int ttcIndex) con
return this->onCreateFromStream(stream, ttcIndex);
}
+SkTypeface* SkFontMgr::createFromStream(SkStreamAsset* stream, const FontParameters& params) const {
+ if (nullptr == stream) {
+ return nullptr;
+ }
+ return this->onCreateFromStream(stream, params);
+}
+
SkTypeface* SkFontMgr::createFromFontData(SkFontData* data) const {
if (nullptr == data) {
return nullptr;
@@ -140,6 +147,11 @@ SkTypeface* SkFontMgr::createFromFontData(SkFontData* data) const {
}
// This implementation is temporary until it can be made pure virtual.
+SkTypeface* SkFontMgr::onCreateFromStream(SkStreamAsset* stream, const FontParameters& p) const {
+ return this->createFromStream(stream, p.getCollectionIndex());
+}
+
+// This implementation is temporary until it can be made pure virtual.
SkTypeface* SkFontMgr::onCreateFromFontData(SkFontData* data) const {
SkTypeface* ret = this->createFromStream(data->detachStream(), data->getIndex());
delete data;