make fontscalar gammatext lcdtext typeface verttext2 gm portable

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"
+    "serif",
+    "sans-serif",
+    "monospace",
 };
 
 class TypefaceGM : public skiagm::GM {

[bungeman-skia, 2015/07/24 17:54:53]

I think the use case for this GM is completely covered by other GMs, and better.
For example, the fontmgr_iter gm is essentially doing this, but with a list of
typefaces actually known to be on the system. I would be all for just removing
this particular gm. I don't think it's ever detected anything interesting.

Note that the other gm in this file, TypefaceStylesGM below, still does
something at least somewhat interesting.

[caryclark, 2015/07/24 17:59:50]

Done.

 public:
     TypefaceGM()
         : fFaces(NULL) {
     }
 
     virtual ~TypefaceGM() {
         if (fFaces) {
             for (size_t i = 0; i < SK_ARRAY_COUNT(gFaces); i++) {
                 SkSafeUnref(fFaces[i]);
             }
             delete [] fFaces;
         }
     }
 
 protected:
     void onOnceBeforeDraw() override {
         fFaces = new SkTypeface*[SK_ARRAY_COUNT(gFaces)];
         for (size_t i = 0; i < SK_ARRAY_COUNT(gFaces); i++) {
-            fFaces[i] = sk_tool_utils::create_portable_typeface(gFaces[i], SkTypeface::kNormal);
+            fFaces[i] = SkTypeface::CreateFromName(sk_tool_utils::platform_font_name(
+                    gFaces[i]), SkTypeface::kNormal);
         }
     }
 
     SkString onShortName() override {
-        return SkString("typeface");
+        SkString name("typeface");
+        name.append(sk_tool_utils::major_platform_os_name());
+        return name;
     }
 
     SkISize onISize() override {
         return SkISize::Make(640, 480);
     }
 
     void onDraw(SkCanvas* canvas) override {
         SkString text("Typefaces are fun!");
         SkScalar y = 0;
 
@@ skipping 113 matching lines @@
 
     virtual ~TypefaceStylesGM() {
         for (int i = 0; i < gFaceStylesCount; i++) {
             SkSafeUnref(fFaces[i]);
         }
     }
 
 protected:
     void onOnceBeforeDraw() override {
         for (int i = 0; i < gFaceStylesCount; i++) {
-            fFaces[i] = sk_tool_utils::create_portable_typeface(gFaceStyles[i].fName,
-                                                         gFaceStyles[i].fStyle);
+            fFaces[i] = SkTypeface::CreateFromName(
+                    sk_tool_utils::platform_font_name(gFaceStyles[i].fName), gFaceStyles[i].fStyle);
         }
     }
 
     SkString onShortName() override {
         SkString name("typefacestyles");
         if (fApplyKerning) {
             name.append("_kerning");
         }
         return name;
     }
@@ skipping 31 matching lines @@
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new TypefaceGM; )
 DEF_GM( return new TypefaceStylesGM(false); )
 DEF_GM( return new TypefaceStylesGM(true); )