aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/core
diff options
context:
space:
mode:
authorGravatar Ben Wagner <bungeman@google.com>2018-06-26 11:22:37 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2018-07-12 17:30:20 +0000
commite346b1eea442065261c14f92b304031e1330e491 (patch)
treeac71ca13242dad662d3bf157370c943596ce4dd0 /src/core
parenta4704078b9d7f6c86cdd29c80840bfc4f15bea1a (diff)
Add SkTypeface::getVariationDesignParameters
This adds a way for users to query the axis parameters for a typeface. Change-Id: Idc2ac0d84bc7ae2ca484ae410cba5b01883418e5 Reviewed-on: https://skia-review.googlesource.com/137706 Commit-Queue: Ben Wagner <bungeman@google.com> Reviewed-by: Mike Reed <reed@google.com>
Diffstat (limited to 'src/core')
-rw-r--r--src/core/SkTypeface.cpp16
-rw-r--r--src/core/SkTypeface_remote.h5
2 files changed, 21 insertions, 0 deletions
diff --git a/src/core/SkTypeface.cpp b/src/core/SkTypeface.cpp
index 8e90f51a9b..cc0bd3f025 100644
--- a/src/core/SkTypeface.cpp
+++ b/src/core/SkTypeface.cpp
@@ -79,6 +79,11 @@ protected:
{
return 0;
}
+ int onGetVariationDesignParameters(SkFontParameters::Variation::Axis parameters[],
+ int parameterCount) const override
+ {
+ return 0;
+ }
int onGetTableTags(SkFontTableTag tags[]) const override { return 0; }
size_t onGetTableData(SkFontTableTag, size_t, size_t, void*) const override {
return 0;
@@ -207,6 +212,12 @@ int SkTypeface::getVariationDesignPosition(
return this->onGetVariationDesignPosition(coordinates, coordinateCount);
}
+int SkTypeface::getVariationDesignParameters(
+ SkFontParameters::Variation::Axis parameters[], int parameterCount) const
+{
+ return this->onGetVariationDesignParameters(parameters, parameterCount);
+}
+
int SkTypeface::countTables() const {
return this->onGetTableTags(nullptr);
}
@@ -324,6 +335,11 @@ sk_sp<SkTypeface> SkTypeface::onMakeClone(const SkFontArguments& args) const {
return sk_ref_sp(this);
}
+int SkTypeface::onGetVariationDesignParameters(
+ SkFontParameters::Variation::Axis parameters[], int parameterCount) const {
+ return -1;
+}
+
///////////////////////////////////////////////////////////////////////////////
#include "SkDescriptor.h"
diff --git a/src/core/SkTypeface_remote.h b/src/core/SkTypeface_remote.h
index 1b4ad89025..c751745b0f 100644
--- a/src/core/SkTypeface_remote.h
+++ b/src/core/SkTypeface_remote.h
@@ -82,6 +82,11 @@ protected:
SK_ABORT("Should never be called.");
return 0;
}
+ int onGetVariationDesignParameters(SkFontParameters::Variation::Axis parameters[],
+ int parameterCount) const override {
+ SK_ABORT("Should never be called.");
+ return 0;
+ }
void onGetFamilyName(SkString* familyName) const override {
// Used by SkStrikeCache::DumpMemoryStatistics.
*familyName = "";