add portable and canonical font support for DM

gm/typeface.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkString.h"
 #include "SkTypeface.h"
 #include "SkTypes.h"
 
 static const char* gFaces[] = {
     "Times Roman",
     "Hiragino Maru Gothic Pro",
     "Papyrus",
     "Helvetica",
     "Courier New"
 };
 
 class TypefaceGM : public skiagm::GM {
 public:
     TypefaceGM() {
         fFaces = new SkTypeface*[SK_ARRAY_COUNT(gFaces)];
         for (size_t i = 0; i < SK_ARRAY_COUNT(gFaces); i++) {
-            fFaces[i] = SkTypeface::CreateFromName(gFaces[i], SkTypeface::kNormal);
+            fFaces[i] = sk_tool_utils::portable_typeface(gFaces[i], SkTypeface::kNormal);
         }
     }
 
     virtual ~TypefaceGM() {
         for (size_t i = 0; i < SK_ARRAY_COUNT(gFaces); i++) {
             SkSafeUnref(fFaces[i]);
         }
         delete [] fFaces;
     }
 
@@ skipping 114 matching lines @@
 
 static const int gFaceStylesCount = SK_ARRAY_COUNT(gFaceStyles);
 
 class TypefaceStylesGM : public skiagm::GM {
     SkTypeface* fFaces[gFaceStylesCount];
     bool fApplyKerning;
 
 public:
     TypefaceStylesGM(bool applyKerning) : fApplyKerning(applyKerning) {
         for (int i = 0; i < gFaceStylesCount; i++) {
-            fFaces[i] = SkTypeface::CreateFromName(gFaceStyles[i].fName,
-                                                   gFaceStyles[i].fStyle);
+            fFaces[i] = sk_tool_utils::portable_typeface(gFaceStyles[i].fName,
+                                                         gFaceStyles[i].fStyle);
         }
     }
 
     virtual ~TypefaceStylesGM() {
         for (int i = 0; i < gFaceStylesCount; i++) {
             SkSafeUnref(fFaces[i]);
         }
     }
 
 protected:
@@ skipping 38 matching lines @@
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new TypefaceGM; )
 DEF_GM( return new TypefaceStylesGM(false); )
 DEF_GM( return new TypefaceStylesGM(true); )