rename portable_typeface_always to portable_typeface

gm/samplerstress.cpp

 /*
  * Copyright 2012 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 "SkShader.h"
@@ skipping 83 matching lines @@
 
         canvas->save();
 
         // draw a letter "M" with a green & red striped texture and a
         // stipple mask with a round rect soft clip
         SkPaint paint;
         paint.setAntiAlias(true);
         paint.setTextSize(72);
         paint.setShader(fShader.get());
         paint.setMaskFilter(fMaskFilter.get());
+        sk_tool_utils::set_portable_typeface(&paint);
 
         SkRect temp;
         temp.set(SkIntToScalar(115),
                  SkIntToScalar(75),
                  SkIntToScalar(144),
                  SkIntToScalar(110));
 
         SkPath path;
         path.addRoundRect(temp, SkIntToScalar(5), SkIntToScalar(5));
 
@@ skipping 10 matching lines @@
         SkPaint paint2;
         paint2.setColor(SK_ColorBLACK);
         paint2.setAntiAlias(true);
         paint2.setTextSize(72);
         paint2.setStyle(SkPaint::kStroke_Style);
         paint2.setStrokeWidth(1);
         canvas->drawText("M", 1,
                          SkIntToScalar(100), SkIntToScalar(100),
                          paint2);
 
-        paint2.setColor(SK_ColorGRAY);
+        paint2.setColor(sk_tool_utils::color_to_565(SK_ColorGRAY));
 
         canvas->drawPath(path, paint2);
     }
 
 private:
     SkBitmap      fTexture;
     bool          fTextureCreated;
     SkAutoTUnref<SkShader>     fShader;
     SkAutoTUnref<SkMaskFilter> fMaskFilter;
 
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new SamplerStressGM; }
 static GMRegistry reg(MyFactory);
 
 }