next batch of portable typeface changes

gm/blurs.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 "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
@@ skipping 22 matching lines @@
         } gRecs[] = {
             { NONE,                 0,  0 },
             { kInner_SkBlurStyle,  -1,  0 },
             { kNormal_SkBlurStyle,  0,  1 },
             { kSolid_SkBlurStyle,   0, -1 },
             { kOuter_SkBlurStyle,   1,  0 },
         };
 
         SkPaint paint;
         paint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface(&paint);
+        sk_tool_utils::set_portable_typeface_always(&paint);
         paint.setTextSize(SkIntToScalar(25));
         canvas->translate(SkIntToScalar(-40), SkIntToScalar(0));
 
         SkBlurMaskFilter::BlurFlags flags = SkBlurMaskFilter::kNone_BlurFlag;
         for (int j = 0; j < 2; j++) {
             canvas->save();
             paint.setColor(SK_ColorBLUE);
             for (size_t i = 0; i < SK_ARRAY_COUNT(gRecs); i++) {
                 if (gRecs[i].fStyle != NONE) {
                     SkMaskFilter* mf = SkBlurMaskFilter::Create(gRecs[i].fStyle,
@@ skipping 103 matching lines @@
         canvas->translate(dx, 0);
         canvas->drawPath(path, paint);
 
         // Translate to outside of clip bounds.
         canvas->translate(-dx, 0);
         canvas->translate(-30, -150);
         canvas->drawPath(path, paint);
     }
 };
 DEF_GM( return new Blur2RectsNonNinePatchGM; )