commit 83c6b96bcd38702ec8bbe98f5f77f91121102ad9
author Ben Wagner <bungeman@google.com> Tue Jul 10 19:40:15 2018 -0400
committer Skia Commit-Bot <skia-commit-bot@chromium.org> Fri Jul 13 15:01:04 2018 +0000
tree 62f6b918894e7d1865c020bb0828b0250c2062c8
parent a07bf6788e926c41d52ae4bed592ec8a187ee4ab

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 <bungeman@google.com>
Reviewed-by: Mike Klein <mtklein@google.com>

dm/DM.cpp

diff --git a/dm/DM.cpp b/dm/DM.cpp
index e66621d..ad37e9d 100644
--- a/dm/DM.cpp
+++ b/dm/DM.cpp
@@ -1408,14 +1408,13 @@
     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++) {