add portable and canonical font support for DM

tools/sk_tool_utils.h

Index: tools/sk_tool_utils.h
diff --git a/tools/sk_tool_utils.h b/tools/sk_tool_utils.h
index 151325d7d1312ec72f63f14c34105b4a5a5817d2..e9bda5f982a12d7de6d7fd3c2e5a92602155c46d 100644
--- a/tools/sk_tool_utils.h
+++ b/tools/sk_tool_utils.h
@@ -8,22 +8,25 @@
 #ifndef sk_tool_utils_DEFINED
 #define sk_tool_utils_DEFINED
 
-#include "SkBitmap.h"
-#include "SkCanvas.h"
 #include "SkImageInfo.h"
-#include "SkPaint.h"
 #include "SkTypeface.h"
 
-namespace sk_tool_utils {
+class SkBitmap;
+class SkCanvas;
+class SkPaint;
+class SkTestFont;
 
-    extern bool gEnablePortableTypeface;
+namespace sk_tool_utils {
 
     const char* colortype_name(SkColorType);
 
     /**
      * Sets the paint to use a platform-independent text renderer.
      */
-    void set_portable_typeface(SkPaint* paint, SkTypeface::Style style = SkTypeface::kNormal);
+    void set_portable_typeface(SkPaint* paint, const char* name = NULL,
+                               SkTypeface::Style style = SkTypeface::kNormal);
+    SkTypeface* create_portable_typeface(const char* name, SkTypeface::Style style);
+    void report_used_chars();
 
     /**
      *  Call canvas->writePixels() by using the pixels from bitmap, but with an info that claims
@@ -31,6 +34,10 @@ namespace sk_tool_utils {
      */
     void write_pixels(SkCanvas*, const SkBitmap&, int x, int y, SkColorType, SkAlphaType);
 
+    // private to sk_tool_utils
+    SkTypeface* create_font(const char* name, SkTypeface::Style );
+    SkTypeface* resource_font(const char* name, SkTypeface::Style );
+
 }  // namespace sk_tool_utils
 
 #endif  // sk_tool_utils_DEFINED