rename portable_typeface_always to portable_typeface

gm/surface.cpp

 /*
  * Copyright 2014 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 "SkGradientShader.h"
 #include "SkSurface.h"
@@ skipping 35 matching lines @@
     paint.setLCDRenderText(true);
     paint.setDither(true);
 
     paint.setShader(make_shader())->unref();
     canvas->drawRect(SkRect::MakeWH(W, H), paint);
     paint.setShader(NULL);
 
     paint.setColor(SK_ColorWHITE);
     paint.setTextSize(32);
     paint.setTextAlign(SkPaint::kCenter_Align);
+    sk_tool_utils::set_portable_typeface(&paint);
     canvas->drawText(label, strlen(label), W / 2, H * 3 / 4, paint);
 }
 
 class SurfacePropsGM : public skiagm::GM {
 public:
     SurfacePropsGM() {}
 
 protected:
     SkString onShortName() override {
         return SkString("surfaceprops");
@@ skipping 84 matching lines @@
 
         SkAutoTUnref<SkImage> image2(surf2->newImageSnapshot());
         canvas->drawImage(image2, 10 + SkIntToScalar(image->width()) + 10, 10, NULL);
     }
 
 private:
     typedef GM INHERITED;
 };
 DEF_GM( return new NewSurfaceGM )