diff options
author | Ben Wagner <bungeman@google.com> | 2017-02-17 18:38:52 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-02-17 18:39:09 +0000 |
commit | 7d07d4663822c05e421f1f50460a985ab43adac4 (patch) | |
tree | 708aca529955646b35468d4364dd75517765ad9a /tests/TypefaceTest.cpp | |
parent | 87e7f820f74a990a59fb8f1d5c182584ce586ecf (diff) |
Revert "Add SkTypeface::getVariationDesignPosition."
This reverts commit 87e7f820f74a990a59fb8f1d5c182584ce586ecf.
Reason for revert: Failed a test on Mac
Original change's description:
> Add SkTypeface::getVariationDesignPosition.
>
> Allow users to query a typeface's position in variation design space.
>
> Change-Id: I5d80c8ff658708a5d1aa386ec5b7396dcb621198
> Reviewed-on: https://skia-review.googlesource.com/7130
> Commit-Queue: Ben Wagner <bungeman@google.com>
> Reviewed-by: Mike Reed <reed@google.com>
>
TBR=bungeman@google.com,reed@google.com,reviews@skia.org,drott@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Change-Id: Ia65792083642dbe9333a62eb75d162931b57cffd
Reviewed-on: https://skia-review.googlesource.com/8670
Reviewed-by: Ben Wagner <bungeman@google.com>
Commit-Queue: Ben Wagner <bungeman@google.com>
Diffstat (limited to 'tests/TypefaceTest.cpp')
-rw-r--r-- | tests/TypefaceTest.cpp | 78 |
1 files changed, 0 insertions, 78 deletions
diff --git a/tests/TypefaceTest.cpp b/tests/TypefaceTest.cpp index 51e2cdd6a7..2a3b32d2cf 100644 --- a/tests/TypefaceTest.cpp +++ b/tests/TypefaceTest.cpp @@ -6,9 +6,6 @@ */ #include "SkData.h" -#include "SkFixed.h" -#include "SkFontMgr.h" -#include "SkMakeUnique.h" #include "SkOTTable_OS_2.h" #include "SkSFNTHeader.h" #include "SkStream.h" @@ -90,76 +87,6 @@ DEF_TEST(TypefaceStyle, reporter) { } } -DEF_TEST(TypefaceAxes, reporter) { - std::unique_ptr<SkStreamAsset> distortable(GetResourceAsStream("/fonts/Distortable.ttf")); - if (!distortable) { - REPORT_FAILURE(reporter, "distortable", SkString()); - return; - } - - sk_sp<SkFontMgr> fm = SkFontMgr::RefDefault(); - const SkFontArguments::VariationPosition::Coordinate position[] = { - { SkSetFourByteTag('w','g','h','t'), SK_ScalarSqrt2 } - }; - SkFontArguments params; - params.setVariationDesignPosition({position, SK_ARRAY_COUNT(position)}); - // TODO: if axes are set and the back-end doesn't support them, should we create the typeface? - sk_sp<SkTypeface> typeface(fm->createFromStream(distortable.release(), params)); - - int count = typeface->getVariationDesignPosition(nullptr, 0); - if (count == -1) { - return; - } - REPORTER_ASSERT(reporter, count == SK_ARRAY_COUNT(position)); - - SkFontArguments::VariationPosition::Coordinate positionRead[SK_ARRAY_COUNT(position)]; - count = typeface->getVariationDesignPosition(positionRead, SK_ARRAY_COUNT(positionRead)); - REPORTER_ASSERT(reporter, count == SK_ARRAY_COUNT(position)); - - REPORTER_ASSERT(reporter, positionRead[0].axis == position[0].axis); - - // Convert to fixed for "almost equal". - SkFixed fixedRead = SkScalarToFixed(positionRead[0].value); - SkFixed fixedOriginal = SkScalarToFixed(position[0].value); - REPORTER_ASSERT(reporter, fixedRead == fixedOriginal); -} - -DEF_TEST(TypefaceVariationIndex, reporter) { - std::unique_ptr<SkStreamAsset> distortable(GetResourceAsStream("/fonts/Distortable.ttf")); - if (!distortable) { - REPORT_FAILURE(reporter, "distortable", SkString()); - return; - } - - sk_sp<SkFontMgr> fm = SkFontMgr::RefDefault(); - SkFontArguments params; - params.setCollectionIndex(0x00010000); - sk_sp<SkTypeface> typeface(fm->createFromStream(distortable.release(), params)); - if (!typeface) { - // FreeType is the only weird thing that supports this, Skia just needs to make sure if it - // gets one of these things make sense. - return; - } - - int count = typeface->getVariationDesignPosition(nullptr, 0); - if (!(count == 1)) { - REPORT_FAILURE(reporter, "count == 1", SkString()); - return; - } - - SkFontArguments::VariationPosition::Coordinate positionRead[1]; - count = typeface->getVariationDesignPosition(positionRead, SK_ARRAY_COUNT(positionRead)); - if (count == -1) { - return; - } - if (!(count == 1)) { - REPORT_FAILURE(reporter, "count == 1", SkString()); - return; - } - REPORTER_ASSERT(reporter, positionRead[0].axis == SkSetFourByteTag('w','g','h','t')); - REPORTER_ASSERT(reporter, positionRead[0].value == 1); -} - DEF_TEST(Typeface, reporter) { sk_sp<SkTypeface> t1(SkTypeface::MakeFromName(nullptr, SkFontStyle())); @@ -207,11 +134,6 @@ protected: SK_ABORT("unimplemented"); return nullptr; } - int onGetVariationDesignPosition(SkFontArguments::VariationPosition::Coordinate coordinates[], - int coordinateCount) 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; } }; |