Revert of make gm background colors 565 compatible

gm/dcshader.cpp

 
 /*
  * Copyright 2014 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"
 #if SK_SUPPORT_GPU
@@ skipping 92 matching lines @@
                                    const SkMatrix* localMatrix, GrColor* color,
                                    GrFragmentProcessor** fp) const {
     *fp = SkNEW_ARGS(DCFP, (fDeviceMatrix));
     *color = GrColorPackA4(paint.getAlpha());
     return true;
 }
 
 class DCShaderGM : public GM {
 public:
     DCShaderGM() {
-        this->setBGColor(sk_tool_utils::color_to_565(0xFFAABBCC));
+        this->setBGColor(0xFFAABBCC);
     }
 
     ~DCShaderGM() override {
         for (int i = 0; i < fPrims.count(); ++i) {
             SkDELETE(fPrims[i]);
         }
     }
 
 protected:
 
@@ skipping 79 matching lines @@
                 const char* text = this->text();
                 static const SkVector offset = SkVector::Make(10, 10);
                 canvas->drawText(text, strlen(text), offset.fX, offset.fY, paint);
                 SkRect bounds;
                 paint.measureText(text, strlen(text), &bounds);
                 bounds.offset(offset);
                 return bounds;
             }
 
             virtual void setFont(SkPaint* paint) {
-                sk_tool_utils::set_portable_typeface_always(paint);
+                sk_tool_utils::set_portable_typeface(paint);
             }
 
             virtual const char* text() const { return "Hello, Skia!"; }
         };
 
         struct BmpText : public Text {
            void setFont(SkPaint* paint) override {
                if (!fTypeface) {
                     fTypeface.reset(GetResourceAsTypeface("/fonts/Funkster.ttf"));
                }
@@ skipping 80 matching lines @@
     };
 
     SkTArray<Prim*> fPrims;
 
     typedef GM INHERITED;
 };
 
 DEF_GM( return SkNEW(DCShaderGM); )
 }
 #endif