convert cubicpaths gm tests to portable

TBR=djsollen

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

diff --git a/gm/cubicpaths.cpp b/gm/cubicpaths.cpp
index 3dd230c..c8230fc 100644 (file)
--- a/gm/cubicpaths.cpp
+++ b/gm/cubicpaths.cpp
@@ -124,8 +124,7 @@ protected:
         SkPaint titlePaint;
         titlePaint.setColor(SK_ColorBLACK);
         titlePaint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface(&titlePaint);
-        titlePaint.setLCDRenderText(true);
+        sk_tool_utils::set_portable_typeface_always(&titlePaint);
         titlePaint.setTextSize(15 * SK_Scalar1);
         const char title[] = "Cubic Drawn Into Rectangle Clips With "
                              "Indicated Style, Fill and Linecaps, with stroke width 10";
@@ -169,8 +168,7 @@ protected:
                     SkPaint labelPaint;
                     labelPaint.setColor(color);
                     labelPaint.setAntiAlias(true);
-                    sk_tool_utils::set_portable_typeface(&labelPaint);
-                    labelPaint.setLCDRenderText(true);
+                    sk_tool_utils::set_portable_typeface_always(&labelPaint);
                     labelPaint.setTextSize(10 * SK_Scalar1);
                     canvas->drawText(gStyles[style].fName,
                                         strlen(gStyles[style].fName),
@@ -271,8 +269,7 @@ protected:
         SkPaint titlePaint;
         titlePaint.setColor(SK_ColorBLACK);
         titlePaint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface(&titlePaint);
-        titlePaint.setLCDRenderText(true);
+        sk_tool_utils::set_portable_typeface_always(&titlePaint);
         titlePaint.setTextSize(15 * SK_Scalar1);
         const char title[] = "Cubic Closed Drawn Into Rectangle Clips With "
                              "Indicated Style, Fill and Linecaps, with stroke width 10";
@@ -316,8 +313,7 @@ protected:
                     SkPaint labelPaint;
                     labelPaint.setColor(color);
                     labelPaint.setAntiAlias(true);
-                    sk_tool_utils::set_portable_typeface(&labelPaint);
-                    labelPaint.setLCDRenderText(true);
+                    sk_tool_utils::set_portable_typeface_always(&labelPaint);
                     labelPaint.setTextSize(10 * SK_Scalar1);
                     canvas->drawText(gStyles[style].fName,
                                         strlen(gStyles[style].fName),