commit 1818acb6a4b11cd9a1d44ce5dde77452502a9796
author caryclark <caryclark@google.com> Fri Jul 24 12:09:25 2015 -0700
committer Commit bot <commit-bot@chromium.org> Fri Jul 24 12:09:25 2015 -0700
tree da32cc017d51c679fc8dab4efa509b3c8603b615
parent d9f13aef8dead11b65b75076746206161c65a3bd

rename portable_typeface_always to portable_typeface

TBR=reed@google.com

Review URL: https://codereview.chromium.org/1257773002

gm/convexpolyclip.cpp

diff --git a/gm/convexpolyclip.cpp b/gm/convexpolyclip.cpp
index c1df69e..0478b51 100644
--- a/gm/convexpolyclip.cpp
+++ b/gm/convexpolyclip.cpp
@@ -56,7 +56,7 @@
     }
 
     paint.setAntiAlias(true);
-    sk_tool_utils::set_portable_typeface_always(&paint);
+    sk_tool_utils::set_portable_typeface(&paint);
     paint.setTextSize(wScalar / 2.2f);
     paint.setShader(0);
     paint.setColor(sk_tool_utils::color_to_565(SK_ColorLTGRAY));
@@ -150,7 +150,7 @@
         SkPaint txtPaint;
         txtPaint.setTextSize(23.f);
         txtPaint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface_always(&txtPaint);
+        sk_tool_utils::set_portable_typeface(&txtPaint);
         txtPaint.setColor(sk_tool_utils::color_to_565(SK_ColorDKGRAY));
         SkScalar textW = txtPaint.measureText(kTxt, SK_ARRAY_COUNT(kTxt)-1);