make gradtext quadpaths gm portable

gm/gradtext.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 "SkGradientShader.h"
@@ skipping 29 matching lines @@
 // Replicate chrome layout test - clipped pathed gradient-shaded text
 class ChromeGradTextGM1 : public GM {
 public:
     ChromeGradTextGM1() { }
 protected:
 
     virtual SkString onShortName() { return SkString("chrome_gradtext1"); }
     virtual SkISize onISize() { return SkISize::Make(500, 480); }
     virtual void onDraw(SkCanvas* canvas) {
         SkPaint paint;
-        sk_tool_utils::set_portable_typeface(&paint);
+        sk_tool_utils::set_portable_typeface_always(&paint);
         SkRect r = SkRect::MakeWH(SkIntToScalar(100), SkIntToScalar(100));
 
         canvas->clipRect(r);
 
         paint.setColor(SK_ColorRED);
         canvas->drawRect(r, paint);
 
         // Minimal repro doesn't require AA, LCD, or a nondefault typeface
         paint.setShader(make_chrome_solid())->unref();
         paint.setTextSize(SkIntToScalar(500));
 
         canvas->drawText("I", 1, 0, 100, paint);
     }
 private:
     typedef GM INHERITED;
 };
 
 
-// Replicate chrome layout test - switching between solid & gadient text
+// Replicate chrome layout test - switching between solid & gradient text
 class ChromeGradTextGM2 : public GM {
 public:
     ChromeGradTextGM2() { }
 protected:
 
     virtual SkString onShortName() { return SkString("chrome_gradtext2"); }
     virtual SkISize onISize() { return SkISize::Make(500, 480); }
     virtual void onDraw(SkCanvas* canvas) {
         SkPaint paint;
-        sk_tool_utils::set_portable_typeface(&paint);
+        sk_tool_utils::set_portable_typeface_always(&paint);
 
         paint.setStyle(SkPaint::kFill_Style);
         canvas->drawText("Normal Fill Text", 16, 0, 50, paint);
         paint.setStyle(SkPaint::kStroke_Style);
         canvas->drawText("Normal Stroke Text", 18, 0, 100, paint);
 
         // Minimal repro doesn't require AA, LCD, or a nondefault typeface
         paint.setShader(make_chrome_solid())->unref();
 
         paint.setStyle(SkPaint::kFill_Style);
@@ skipping 32 matching lines @@
         p.setAntiAlias(true);
         canvas->translate(0, paint.getTextSize() * 4/3);
         draw_text(canvas, p);
         p.setLCDRenderText(true);
         canvas->translate(0, paint.getTextSize() * 4/3);
         draw_text(canvas, p);
     }
 
     void onDraw(SkCanvas* canvas) override {
         SkPaint paint;
-        sk_tool_utils::set_portable_typeface(&paint);
+        sk_tool_utils::set_portable_typeface_always(&paint);
         paint.setTextSize(SkIntToScalar(26));
 
         const SkISize& size = this->getISize();
         SkRect r = SkRect::MakeWH(SkIntToScalar(size.width()),
                                   SkIntToScalar(size.height()) / 2);
         canvas->drawRect(r, paint);
 
         canvas->translate(SkIntToScalar(20), paint.getTextSize());
 
         for (int i = 0; i < 2; ++i) {
@@ skipping 16 matching lines @@
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new GradTextGM; }
 static GM* CMyFactory(void*) { return new ChromeGradTextGM1; }
 static GM* CMyFactory2(void*) { return new ChromeGradTextGM2; }
 
 static GMRegistry reg(MyFactory);
 static GMRegistry Creg(CMyFactory);
 static GMRegistry Creg2(CMyFactory2);
 }