Revert of Revert of make gm background colors 565 compatible

gm/shadertext2.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 25 matching lines @@
 ///////////////////////////////////////////////////////////////////////////////
 
 struct LabeledMatrix {
     SkMatrix    fMatrix;
     const char* fLabel;
 };
 
 class ShaderText2GM : public GM {
 public:
     ShaderText2GM() {
-        this->setBGColor(0xFFDDDDDD);
+        this->setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD));
     }
 
 protected:
 
     SkString onShortName() override {
         return SkString("shadertext2");
     }
 
     SkISize onISize() override { return SkISize::Make(1800, 900); }
 
@@ skipping 26 matching lines @@
         localMatrices.top().fMatrix.setPerspY(+0.008f);
         localMatrices.top().fLabel = "Persp";
 
         static SkBitmap bmp;
         if (bmp.isNull()) {
             makebm(&bmp, kPointSize / 2, kPointSize / 2);
         }
 
         SkPaint fillPaint;
         fillPaint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface(&fillPaint);
+        sk_tool_utils::set_portable_typeface_always(&fillPaint);
         fillPaint.setTextSize(SkIntToScalar(kPointSize));
         fillPaint.setFilterQuality(kLow_SkFilterQuality);
 
         SkPaint outlinePaint;
         outlinePaint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface(&outlinePaint);
+        sk_tool_utils::set_portable_typeface_always(&outlinePaint);
         outlinePaint.setTextSize(SkIntToScalar(kPointSize));
         outlinePaint.setStyle(SkPaint::kStroke_Style);
         outlinePaint.setStrokeWidth(0.f);
 
         SkScalar w = fillPaint.measureText(kText, kTextLen);
         static SkScalar kPadY = 0.5f * kPointSize;
         static SkScalar kPadX = 1.5f * kPointSize;
 
         SkPaint strokePaint(fillPaint);
         strokePaint.setStyle(SkPaint::kStroke_Style);
         strokePaint.setStrokeWidth(kPointSize * 0.1f);
 
         SkPaint labelPaint;
         labelPaint.setColor(0xff000000);
         labelPaint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface(&labelPaint);
+        sk_tool_utils::set_portable_typeface_always(&labelPaint);
         labelPaint.setTextSize(12.f);
 
         canvas->translate(15.f, 15.f);
         canvas->drawBitmap(bmp, 0, 0);
         canvas->translate(0, bmp.height() + labelPaint.getTextSize() + 15.f);
 
         static const char kLabelLabel[] = "localM / canvasM";
         canvas->drawText(kLabelLabel, strlen(kLabelLabel), 0, 0, labelPaint);
         canvas->translate(0, 15.f);
 
@@ skipping 75 matching lines @@
 
 private:
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new ShaderText2GM; }
 static GMRegistry reg(MyFactory);
 }