aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/TypefaceTest.cpp
diff options
context:
space:
mode:
authorGravatar Mike Klein <mtklein@chromium.org>2017-11-09 13:45:10 -0500
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-11-10 15:30:57 +0000
commitcb6940bf42e39271afe0fb3c2bfdd9e28d12f504 (patch)
tree9d600f8679a5694c3b4ff71166d67cf09a37d433 /tests/TypefaceTest.cpp
parent35970ec0c861f7b5ee7cca2789b7dc5954cb6bb4 (diff)
DM FontMgr updates
- return nullptr for the various makeFromFoo() that we can't support, and tweak a few unit tests to bail out early when they do - create FontStyleSet and SkTypefaces once - abort early from FontHostStream if we can't openStream() - implement SkTestTypeface::onCreateFamilyNameIterator() with SkOTUtils::LocalizedStrings_SingleName() so FontNames passes - pin out-of-range glyph IDs to zero in SkTestTypeface Change-Id: Iac53265e331fc1c5c507513af3ab299063e6610a Reviewed-on: https://skia-review.googlesource.com/69501 Reviewed-by: Ben Wagner <bungeman@google.com> Commit-Queue: Mike Klein <mtklein@chromium.org>
Diffstat (limited to 'tests/TypefaceTest.cpp')
-rw-r--r--tests/TypefaceTest.cpp10
1 files changed, 9 insertions, 1 deletions
diff --git a/tests/TypefaceTest.cpp b/tests/TypefaceTest.cpp
index 6175d36157..c8e96c5a7c 100644
--- a/tests/TypefaceTest.cpp
+++ b/tests/TypefaceTest.cpp
@@ -50,7 +50,10 @@ static void TypefaceStyle_test(skiatest::Reporter* reporter,
os2Table->usWidthClass.value = static_cast<WidthType>(SkEndian_SwapBE16(width));
sk_sp<SkTypeface> newTypeface(SkTypeface::MakeFromStream(new SkMemoryStream(sk_ref_sp(data))));
- SkASSERT_RELEASE(newTypeface);
+ if (!newTypeface) {
+ // Not all SkFontMgr can MakeFromStream().
+ return;
+ }
SkFontStyle newStyle = newTypeface->fontStyle();
@@ -111,6 +114,11 @@ DEF_TEST(TypefaceAxes, reporter) {
// TODO: if axes are set and the back-end doesn't support them, should we create the typeface?
sk_sp<SkTypeface> typeface = fm->makeFromStream(std::move(distortable), params);
+ if (!typeface) {
+ // Not all SkFontMgr can makeFromStream().
+ return;
+ }
+
int count = typeface->getVariationDesignPosition(nullptr, 0);
if (count == -1) {
return;