convert cubicpaths gm tests to portable

gm/cubicpaths.cpp

 /*
  * Copyright 2011 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 "SkCanvas.h"
 #include "SkPaint.h"
 #include "SkRandom.h"
@@ skipping 106 matching lines @@
         PathAndName path;
         path.fPath.moveTo(25*SK_Scalar1, 10*SK_Scalar1);
         path.fPath.cubicTo(40*SK_Scalar1, 20*SK_Scalar1,
                            60*SK_Scalar1, 20*SK_Scalar1,
                            75*SK_Scalar1, 10*SK_Scalar1);
         path.fName = "moveTo-cubic";
 
         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";
         canvas->drawText(title, strlen(title),
                             20 * SK_Scalar1,
                             20 * SK_Scalar1,
                             titlePaint);
 
         SkRandom rand;
         SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1);
@@ skipping 23 matching lines @@
                     SkPaint rectPaint;
                     rectPaint.setColor(SK_ColorBLACK);
                     rectPaint.setStyle(SkPaint::kStroke_Style);
                     rectPaint.setStrokeWidth(-1);
                     rectPaint.setAntiAlias(true);
                     canvas->drawRect(rect, rectPaint);
 
                     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),
                                         0, rect.height() + 12 * SK_Scalar1,
                                         labelPaint);
                     canvas->drawText(gFills[fill].fName,
                                         strlen(gFills[fill].fName),
                                         0, rect.height() + 24 * SK_Scalar1,
                                         labelPaint);
                     canvas->drawText(gCaps[cap].fName,
@@ skipping 80 matching lines @@
         path.fPath.moveTo(25*SK_Scalar1, 10*SK_Scalar1);
         path.fPath.cubicTo(40*SK_Scalar1, 20*SK_Scalar1,
                            60*SK_Scalar1, 20*SK_Scalar1,
                            75*SK_Scalar1, 10*SK_Scalar1);
         path.fPath.close();
         path.fName = "moveTo-cubic-close";
 
         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";
         canvas->drawText(title, strlen(title),
                             20 * SK_Scalar1,
                             20 * SK_Scalar1,
                             titlePaint);
 
         SkRandom rand;
         SkRect rect = SkRect::MakeWH(100*SK_Scalar1, 30*SK_Scalar1);
@@ skipping 23 matching lines @@
                     SkPaint rectPaint;
                     rectPaint.setColor(SK_ColorBLACK);
                     rectPaint.setStyle(SkPaint::kStroke_Style);
                     rectPaint.setStrokeWidth(-1);
                     rectPaint.setAntiAlias(true);
                     canvas->drawRect(rect, rectPaint);
 
                     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),
                                         0, rect.height() + 12 * SK_Scalar1,
                                         labelPaint);
                     canvas->drawText(gFills[fill].fName,
                                         strlen(gFills[fill].fName),
                                         0, rect.height() + 24 * SK_Scalar1,
                                         labelPaint);
                     canvas->drawText(gCaps[cap].fName,
@@ skipping 11 matching lines @@
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM( return new CubicPathGM; )
 DEF_GM( return new CubicClosePathGM; )
 DEF_GM( return new ClippedCubicGM; )