From 83c6b96bcd38702ec8bbe98f5f77f91121102ad9 Mon Sep 17 00:00:00 2001 From: Ben Wagner Date: Tue, 10 Jul 2018 19:40:15 -0400 Subject: Improve SkTestFontMgr. This moves the portable typefaces into the portable font manager. Change-Id: Id25e8f0b90f99c82d09cfb3ef136bda8c7728ee9 Reviewed-on: https://skia-review.googlesource.com/140351 Commit-Queue: Ben Wagner Reviewed-by: Mike Klein --- dm/DM.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'dm') diff --git a/dm/DM.cpp b/dm/DM.cpp index e66621d7c2..ad37e9dd50 100644 --- a/dm/DM.cpp +++ b/dm/DM.cpp @@ -1408,14 +1408,13 @@ int main(int argc, char** argv) { parallel.wait(); gDefinitelyThreadSafeWork.wait(); + // At this point we're back in single-threaded land. + // We'd better have run everything. SkASSERT(gPending == 0); // Make sure we've flushed all our results to disk. JsonWriter::DumpJson(); - // At this point we're back in single-threaded land. - sk_tool_utils::release_portable_typefaces(); - if (gFailures.count() > 0) { info("Failures:\n"); for (int i = 0; i < gFailures.count(); i++) { -- cgit v1.2.3