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"
-};
-
-class TypefaceGM : public skiagm::GM {
-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);
-        }
-    }
-
-    SkString onShortName() override {
-        return SkString("typeface");
-    }
-
-    SkISize onISize() override {
-        return SkISize::Make(640, 480);
-    }
-
-    void onDraw(SkCanvas* canvas) override {
-        SkString text("Typefaces are fun!");
-        SkScalar y = 0;
-
-        SkPaint paint;
-        paint.setAntiAlias(true);
-        for (int i = 0; i < (int)SK_ARRAY_COUNT(gFaces); i++) {
-            this->drawWithFace(text, i, y, paint, canvas);
-        }
-        // Now go backwards
-        for (int i = SK_ARRAY_COUNT(gFaces) - 1; i >= 0; i--) {
-            this->drawWithFace(text, i, y, paint, canvas);
-        }
-    }
-
-private:
-    void drawWithFace(const SkString& text, int i, SkScalar& y, SkPaint& paint,
-                      SkCanvas* canvas) {
-        paint.setTypeface(fFaces[i]);
-        y += paint.getFontMetrics(NULL);
-        canvas->drawText(text.c_str(), text.size(), 0, y, paint);
-    }
-
-    SkTypeface** fFaces;
-
-    typedef skiagm::GM INHERITED;
-};
-
-///////////////////////////////////////////////////////////////////////////////
-
 static void getGlyphPositions(const SkPaint& paint, const uint16_t glyphs[],
                              int count, SkScalar x, SkScalar y, SkPoint pos[]) {
     SkASSERT(SkPaint::kGlyphID_TextEncoding == paint.getTextEncoding());
 
     SkAutoSTMalloc<128, SkScalar> widthStorage(count);
     SkScalar* widths = widthStorage.get();
     paint.getTextWidths(glyphs, count * sizeof(uint16_t), widths);
 
     for (int i = 0; i < count; ++i) {
         pos[i].set(x, y);
@@ skipping 77 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");
         }
+        name.append(sk_tool_utils::major_platform_os_name());
         return name;
     }
 
     SkISize onISize() override {
         return SkISize::Make(640, 480);
     }
 
     void onDraw(SkCanvas* canvas) override {
         SkPaint paint;
         paint.setAntiAlias(true);
@@ skipping 20 matching lines @@
             y += dy;
         }
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
-DEF_GM( return new TypefaceGM; )
 DEF_GM( return new TypefaceStylesGM(false); )
 DEF_GM( return new TypefaceStylesGM(true); )