rename portable_typeface_always to portable_typeface
TBR=reed@google.com
Review URL: https://codereview.chromium.org/1257773002
diff --git a/gm/imagefiltersbase.cpp b/gm/imagefiltersbase.cpp
index 993e654..426a4dc 100644
--- a/gm/imagefiltersbase.cpp
+++ b/gm/imagefiltersbase.cpp
@@ -145,7 +145,7 @@
paint.setImageFilter(imf);
paint.setColor(SK_ColorCYAN);
paint.setAntiAlias(true);
- sk_tool_utils::set_portable_typeface_always(&paint);
+ sk_tool_utils::set_portable_typeface(&paint);
paint.setTextSize(r.height()/2);
paint.setTextAlign(SkPaint::kCenter_Align);
canvas->drawText("Text", 4, r.centerX(), r.centerY(), paint);
@@ -283,7 +283,7 @@
SkPaint::kAntiAlias_Flag | SkPaint::kLCDRenderText_Flag,
};
SkPaint paint(origPaint);
- sk_tool_utils::set_portable_typeface_always(&paint);
+ sk_tool_utils::set_portable_typeface(&paint);
paint.setTextSize(30);
SkAutoCanvasRestore acr(canvas, true);