make fontscalar gammatext lcdtext typeface verttext2 gm portable

gm/fontscaler.cpp

 /*
  * Copyright 2011 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 "SkTypeface.h"
 
 namespace skiagm {
 
 class FontScalerGM : public GM {
 public:
     FontScalerGM() {
         this->setBGColor(0xFFFFFFFF);
     }
 
     virtual ~FontScalerGM() {
     }
 
 protected:
 
     SkString onShortName() override {
-        return SkString("fontscaler");
+        SkString name("fontscaler");
+        name.append(sk_tool_utils::major_platform_os_name());
+        return name;
     }
 
     SkISize onISize() override {
         return SkISize::Make(1450, 750);
     }
 
     static void rotate_about(SkCanvas* canvas,
                              SkScalar degrees,
                              SkScalar px, SkScalar py) {
         canvas->translate(px, py);
         canvas->rotate(degrees);
         canvas->translate(-px, -py);
     }
 
     void onDraw(SkCanvas* canvas) override {
         SkPaint paint;
 
         paint.setAntiAlias(true);
         paint.setLCDRenderText(true);
         //With freetype the default (normal hinting) can be really ugly.
         //Most distros now set slight (vertical hinting only) in any event.
         paint.setHinting(SkPaint::kSlight_Hinting);
-        sk_tool_utils::set_portable_typeface(&paint, "Times Roman", SkTypeface::kNormal);
 
         const char* text = "Hamburgefons ooo mmm";
         const size_t textLen = strlen(text);
 
         for (int j = 0; j < 2; ++j) {
             // This used to do 6 iterations but it causes the N4 to crash in the MSAA4 config.
             for (int i = 0; i < 5; ++i) {
                 SkScalar x = SkIntToScalar(10);
                 SkScalar y = SkIntToScalar(20);
 
@@ skipping 25 matching lines @@
 private:
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new FontScalerGM; }
 static GMRegistry reg(MyFactory);
 
 }