rename portable_typeface_always to portable_typeface

gm/imageblur2.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 "SkBlurImageFilter.h"
 #include "SkRandom.h"
@@ skipping 46 matching lines @@
             for (int y = 0; y < sigmaCount; y++) {
                 SkScalar sigmaY = kBlurSigmas[y];
 
                 SkPaint paint;
                 paint.setImageFilter(SkBlurImageFilter::Create(sigmaX, sigmaY))->unref();
                 canvas->saveLayer(NULL, &paint);
 
                 SkRandom rand;
                 SkPaint textPaint;
                 textPaint.setAntiAlias(false);
-                textPaint.setColor(rand.nextBits(24) | 0xFF000000);
+                textPaint.setColor(sk_tool_utils::color_to_565(rand.nextBits(24) | 0xFF000000));
+                sk_tool_utils::set_portable_typeface(&textPaint);
                 textPaint.setTextSize(textSize);
 
                 for (int i = 0; i < testStringCount; i++) {
                     canvas->drawText(kTestStrings[i],
                                      strlen(kTestStrings[i]),
                                      SkIntToScalar(x * dx),
                                      SkIntToScalar(y * dy + textSize * i + textSize),
                                      textPaint);
                 }
                 canvas->restore();
             }
         }
     }
 
 private:
     SkString fName;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new BlurImageFilter; }
 static GMRegistry reg(MyFactory);
 
 }