Revert of make gm background colors 565 compatible

gm/shadertext3.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 30 matching lines @@
     const char* fLabel;
 };
 
 static const char kText[] = "B";
 static const int kTextLen = SK_ARRAY_COUNT(kText) - 1;
 static const int kPointSize = 300;
 
 class ShaderText3GM : public GM {
 public:
     ShaderText3GM() {
-        this->setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD));
+        this->setBGColor(0xFFDDDDDD);
     }
 
 protected:
 
     SkString onShortName() override {
         return SkString("shadertext3");
     }
 
     SkISize onISize() override{ return SkISize::Make(800, 1000); }
 
     void onOnceBeforeDraw() override {
         makebm(&fBmp, kPointSize / 4, kPointSize / 4);
     }
 
     void onDraw(SkCanvas* canvas) override {
 
         SkPaint bmpPaint;
         bmpPaint.setAntiAlias(true);
         bmpPaint.setFilterQuality(kLow_SkFilterQuality);
         bmpPaint.setAlpha(0x80);
         canvas->drawBitmap(fBmp, 5.f, 5.f, &bmpPaint);
 
         SkPaint outlinePaint;
         outlinePaint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface_always(&outlinePaint);
+        sk_tool_utils::set_portable_typeface(&outlinePaint);
         outlinePaint.setTextSize(SkIntToScalar(kPointSize));
         outlinePaint.setStyle(SkPaint::kStroke_Style);
         outlinePaint.setStrokeWidth(0.f);
 
         canvas->translate(15.f, 15.f);
 
         // draw glyphs scaled up
         canvas->scale(2.f, 2.f);
 
         static const SkShader::TileMode kTileModes[] = {
@@ skipping 13 matching lines @@
                 localM.postRotate(20);
                 localM.postScale(1.15f, .85f);
 
                 SkAutoTUnref<SkShader> shader(SkShader::CreateBitmapShader(fBmp,
                                                                            kTileModes[tm0],
                                                                            kTileModes[tm1],
                                                                            &localM));
 
                 SkPaint fillPaint;
                 fillPaint.setAntiAlias(true);
-                sk_tool_utils::set_portable_typeface_always(&fillPaint);
+                sk_tool_utils::set_portable_typeface(&fillPaint);
                 fillPaint.setTextSize(SkIntToScalar(kPointSize));
                 fillPaint.setFilterQuality(kLow_SkFilterQuality);
                 fillPaint.setShader(shader);
 
                 canvas->drawText(kText, kTextLen, 0, 0, fillPaint);
                 canvas->drawText(kText, kTextLen, 0, 0, outlinePaint);
                 SkScalar w = fillPaint.measureText(kText, kTextLen);
                 canvas->translate(w + 10.f, 0.f);
                 ++i;
                 if (!(i % 2)) {
                     canvas->restore();
                     canvas->translate(0, 0.75f * kPointSize);
                     canvas->save();
                 }
             }
         }
         canvas->restore();
     }
 
 private:
     SkBitmap fBmp;
     typedef GM INHERITED;
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new ShaderText3GM; }
 static GMRegistry reg(MyFactory);
 }