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>

1 files changed, 2 insertions, 3 deletions

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++) {