aboutsummaryrefslogtreecommitdiffhomepage
path: root/tests/FontHostStreamTest.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/FontHostStreamTest.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/FontHostStreamTest.cpp')
-rw-r--r--tests/FontHostStreamTest.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/tests/FontHostStreamTest.cpp b/tests/FontHostStreamTest.cpp
index c3bc878da8..e97ea0dcc2 100644
--- a/tests/FontHostStreamTest.cpp
+++ b/tests/FontHostStreamTest.cpp
@@ -88,6 +88,12 @@ DEF_TEST(FontHostStream, reporter) {
: SkTypeface::MakeDefault());
int ttcIndex;
std::unique_ptr<SkStreamAsset> fontData(typeface->openStream(&ttcIndex));
+ if (!fontData) {
+ // We're using a SkTypeface that can't give us a stream.
+ // This happens with portable or system fonts. End the test now.
+ return;
+ }
+
sk_sp<SkTypeface> streamTypeface(SkTypeface::MakeFromStream(fontData.release()));
SkFontDescriptor desc;