make fontscalar gammatext lcdtext typeface verttext2 gm portable

gm/lcdtext.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.
  */
 
 
 /* Tests text rendering with LCD and subpixel rendering turned on and off.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkPicture.h"
 #include "SkPictureImageFilter.h"
 #include "SkPictureRecorder.h"
 #include "SkSurface.h"
 
 
 class LcdTextGM : public skiagm::GM {
 public:
     LcdTextGM() {
         const int pointSize = 36;
         textHeight = SkIntToScalar(pointSize);
     }
     
 protected:
     
     SkString onShortName() {
-        return SkString("lcdtext");
+        SkString name("lcdtext");
+        name.append(sk_tool_utils::major_platform_os_name());
+        return name;
     }
     
     SkISize onISize() { return SkISize::Make(640, 480); }
     
     virtual void onDraw(SkCanvas* canvas) {
         
         y = textHeight;
         drawText(canvas, SkString("TEXT: SubpixelTrue LCDRenderTrue"),
                  true,  true);
         drawText(canvas, SkString("TEXT: SubpixelTrue LCDRenderFalse"),
                  true,  false);
         drawText(canvas, SkString("TEXT: SubpixelFalse LCDRenderTrue"),
                  false, true);
         drawText(canvas, SkString("TEXT: SubpixelFalse LCDRenderFalse"),
                  false, false);
     }
     
     void drawText(SkCanvas* canvas, const SkString& string,
                   bool subpixelTextEnabled, bool lcdRenderTextEnabled) {
         SkPaint paint;
         paint.setColor(SK_ColorBLACK);
         paint.setDither(true);
         paint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface(&paint);
         paint.setSubpixelText(subpixelTextEnabled);
         paint.setLCDRenderText(lcdRenderTextEnabled);
         paint.setTextSize(textHeight);
         
         canvas->drawText(string.c_str(), string.size(), 0, y, paint);
         y += textHeight;
     }
     
 private:
     typedef skiagm::GM INHERITED;
@@ skipping 56 matching lines @@
             canvas->drawText(rec[i].fText, strlen(rec[i].fText), loc.x(), loc.y(), paint);
         }
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 DEF_GM( return new LcdTextGM; )
 DEF_GM( return new LcdTextSizeGM; )