update portable fonts

dm/DM.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "CrashHandler.h"
 #include "DMJsonWriter.h"
 #include "DMSrcSink.h"
 #include "DMSrcSinkAndroid.h"
 #include "OverwriteLine.h"
 #include "ProcStats.h"
 #include "SkBBHFactory.h"
 #include "SkChecksum.h"
 #include "SkCommonFlags.h"
+#include "SkFontMgr.h"
 #include "SkForceLinking.h"
 #include "SkGraphics.h"
 #include "SkInstCnt.h"
 #include "SkMD5.h"
 #include "SkOSFile.h"
 #include "SkTHash.h"
 #include "SkTaskGroup.h"
 #include "SkThreadUtils.h"
 #include "Test.h"
 #include "Timer.h"
+#include "sk_tool_utils.h"
 
 DEFINE_string(src, "tests gm skp image", "Source types to test.");
 DEFINE_bool(nameByHash, false,
             "If true, write to FLAGS_writePath[0]/<hash>.png instead of "
             "to FLAGS_writePath[0]/<config>/<sourceType>/<sourceOptions>/<name>.png");
 DEFINE_bool2(pathOpsExtended, x, false, "Run extended pathOps tests.");
 DEFINE_string(matrix, "1 0 0 1",
               "2x2 scale+skew matrix to apply or upright when using "
               "'matrix' or 'upright' in config.");
 DEFINE_bool(gpu_threading, false, "Allow GPU work to run on multiple threads?");
@@ skipping 663 matching lines @@
                     }
                 }
                 SkDebugf("\nCurrently running:%s\n", running.c_str());
             }
         }
     };
     static SkThread* intentionallyLeaked = new SkThread(Loop::forever);
     intentionallyLeaked->start();
 }
 
+#define PORTABLE_FONT_PREFIX "Toy Liberation "
+
+static SkTypeface* CreateFromName(const char familyName[], SkTypeface::Style style) {

[mtklein, 2015/06/09 14:39:48]

create_from_name?

[caryclark, 2015/06/09 16:37:21]

Done.

+    if (familyName && strlen(familyName) > sizeof(PORTABLE_FONT_PREFIX)
+                && !strncmp(familyName, PORTABLE_FONT_PREFIX, sizeof(PORTABLE_FONT_PREFIX) - 1)) {
+            return sk_tool_utils::create_portable_typeface_always(familyName, style);
+    }
+    if (NULL == familyName) {
+        return SkTypeface::RefDefault(style);
+    }
+    SkAutoTUnref<SkFontMgr> fm(SkFontMgr::RefDefault());
+    return fm->legacyCreateTypeface(familyName, style);
+}
+
+#undef PORTABLE_FONT_PREFIX
+
+void SetupPortableTypeface() {
+    SkTypeface::AddCreateDelegate(&CreateFromName);

[mtklein, 2015/06/09 14:39:48]

Perhaps we could inline this into main.

[caryclark, 2015/06/09 16:37:21]

Done.

+}
+
 int dm_main();
 int dm_main() {
     SetupCrashHandler();
     SkAutoGraphics ag;
     SkTaskGroup::Enabler enabled(FLAGS_threads);
     if (FLAGS_leaks) {
         SkInstCountPrintLeaksOnExit();
     }
+    SetupPortableTypeface();
 
     start_keepalive();
 
     gather_gold();
     gather_uninteresting_hashes();
 
     gather_srcs();
     gather_sinks();
     gather_tests();
 
@@ skipping 45 matching lines @@
     }
     return 0;
 }
 
 #if !defined(SK_BUILD_FOR_IOS)
 int main(int argc, char** argv) {
     SkCommandLineFlags::Parse(argc, argv);
     return dm_main();
 }
 #endif