fix portable text in test

gm/all_bitmap_configs.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "sk_tool_utils.h"
 #include "SkSurface.h"
 #include "Resources.h"
@@ skipping 48 matching lines @@
     SkRect bounds;
     p->setColor(color);
     p->measureText(&c, 1, &bounds);
     canvas->drawText(&c, 1, x - bounds.centerX(), y - bounds.centerY(), *p);
 }
 
 static void color_wheel_native(SkCanvas* canvas) {
     SkAutoCanvasRestore autoCanvasRestore(canvas, true);
     canvas->translate(0.5f * SCALE, 0.5f * SCALE);
     SkPaint p;
-    sk_tool_utils::set_portable_typeface_always(&p);
     p.setAntiAlias(false);
     p.setColor(SK_ColorWHITE);
     canvas->drawCircle(0.0f, 0.0f, SCALE * 0.5f, p);
 
     const double sqrt_3_over_2 = 0.8660254037844387;
     const SkScalar Z = 0.0f;
     const SkScalar D = 0.3f * SkIntToScalar(SCALE);
     const SkScalar X = SkDoubleToScalar(D * sqrt_3_over_2);
     const SkScalar Y = D * SK_ScalarHalf;
-    sk_tool_utils::set_portable_typeface(&p, NULL, SkTypeface::kBold);
+    sk_tool_utils::set_portable_typeface_always(&p, NULL, SkTypeface::kBold);
     p.setTextSize(0.28125f * SCALE);
     draw_center_letter('K', &p, SK_ColorBLACK, Z, Z, canvas);
     draw_center_letter('R', &p, SK_ColorRED, Z, D, canvas);
     draw_center_letter('G', &p, SK_ColorGREEN, -X, -Y, canvas);
     draw_center_letter('B', &p, SK_ColorBLUE, X, -Y, canvas);
     draw_center_letter('C', &p, SK_ColorCYAN, Z, -D, canvas);
     draw_center_letter('M', &p, SK_ColorMAGENTA, X, Y, canvas);
     draw_center_letter('Y', &p, SK_ColorYELLOW, -X, Y, canvas);
 }
 
@@ skipping 95 matching lines @@
 
     canvas->translate(0.0f, SkIntToScalar(SCALE));
     SkBitmap bitmapA8 = make_bitmap(kAlpha_8_SkColorType);
     draw(canvas, p, bitmapA8, kAlpha_8_SkColorType, "Alpha 8");
 
     p.setColor(SK_ColorRED);
     canvas->translate(0.0f, SkIntToScalar(SCALE));
     SkBitmap bitmapG8 = make_bitmap(kGray_8_SkColorType);
     draw(canvas, p, bitmapG8, kGray_8_SkColorType, "Gray 8");
 }