From e346b1eea442065261c14f92b304031e1330e491 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Tue, 26 Jun 2018 11:22:37 -0400 Subject: 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 Reviewed-by: Mike Reed --- tools/fonts/SkRandomScalerContext.cpp | 6 ++++++ tools/fonts/SkRandomScalerContext.h | 2 ++ tools/fonts/SkTestSVGTypeface.h | 6 ++++++ tools/fonts/SkTestTypeface.h | 6 ++++++ 4 files changed, 20 insertions(+) (limited to 'tools') diff --git a/tools/fonts/SkRandomScalerContext.cpp b/tools/fonts/SkRandomScalerContext.cpp index c7cfbff9c3..d32fd62604 100644 --- a/tools/fonts/SkRandomScalerContext.cpp +++ b/tools/fonts/SkRandomScalerContext.cpp @@ -217,6 +217,12 @@ int SkRandomTypeface::onGetVariationDesignPosition( return fProxy->onGetVariationDesignPosition(coordinates, coordinateCount); } +int SkRandomTypeface::onGetVariationDesignParameters( + SkFontParameters::Variation::Axis parameters[], int parameterCount) const +{ + return fProxy->onGetVariationDesignParameters(parameters, parameterCount); +} + int SkRandomTypeface::onGetTableTags(SkFontTableTag tags[]) const { return fProxy->getTableTags(tags); } diff --git a/tools/fonts/SkRandomScalerContext.h b/tools/fonts/SkRandomScalerContext.h index 8eb8b99f52..42f6095ed7 100644 --- a/tools/fonts/SkRandomScalerContext.h +++ b/tools/fonts/SkRandomScalerContext.h @@ -43,6 +43,8 @@ protected: int onGetVariationDesignPosition(SkFontArguments::VariationPosition::Coordinate coordinates[], int coordinateCount) const override; + int onGetVariationDesignParameters(SkFontParameters::Variation::Axis parameters[], + int parameterCount) const override; int onGetTableTags(SkFontTableTag tags[]) const override; size_t onGetTableData(SkFontTableTag, size_t offset, size_t length, void* data) const override; diff --git a/tools/fonts/SkTestSVGTypeface.h b/tools/fonts/SkTestSVGTypeface.h index 2275c678a5..597ec33902 100644 --- a/tools/fonts/SkTestSVGTypeface.h +++ b/tools/fonts/SkTestSVGTypeface.h @@ -110,6 +110,12 @@ protected: return 0; } + int onGetVariationDesignParameters(SkFontParameters::Variation::Axis parameters[], + int parameterCount) const override + { + return 0; + } + int onGetTableTags(SkFontTableTag tags[]) const override { return 0; } diff --git a/tools/fonts/SkTestTypeface.h b/tools/fonts/SkTestTypeface.h index e5ca64ff9a..677874399b 100644 --- a/tools/fonts/SkTestTypeface.h +++ b/tools/fonts/SkTestTypeface.h @@ -104,6 +104,12 @@ protected: return 0; } + int onGetVariationDesignParameters(SkFontParameters::Variation::Axis parameters[], + int parameterCount) const override + { + return 0; + } + int onGetTableTags(SkFontTableTag tags[]) const override { return 0; } -- cgit v1.2.3