Revert of make gm background colors 565 compatible

gm/bitmapcopy.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"
 
 namespace skiagm {
@@ skipping 30 matching lines @@
     paint.setColor(SK_ColorYELLOW);
     canvas->drawRectCoords(SkIntToScalar(width / 2), SkIntToScalar(height / 2),
         SkIntToScalar(width), SkIntToScalar(height), paint);
 }
 
 class BitmapCopyGM : public GM {
 public:
     SkBitmap    fDst[NUM_CONFIGS];
 
     BitmapCopyGM() {
-        this->setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD));
+        this->setBGColor(0xFFDDDDDD);
     }
 
 protected:
     virtual SkString onShortName() {
         return SkString("bitmapcopy");
     }
 
     virtual SkISize onISize() {
         return SkISize::Make(540, 330);
     }
 
     virtual void onDraw(SkCanvas* canvas) {
         SkPaint paint;
         SkScalar horizMargin = 10;
         SkScalar vertMargin = 10;
 
         SkBitmap src;
         src.allocN32Pixels(40, 40);
         SkCanvas canvasTmp(src);
 
         draw_checks(&canvasTmp, 40, 40);
 
         for (unsigned i = 0; i < NUM_CONFIGS; ++i) {
             src.copyTo(&fDst[i], gColorTypes[i]);
         }
 
-        canvas->clear(sk_tool_utils::color_to_565(0xFFDDDDDD));
+        canvas->clear(0xFFDDDDDD);
         paint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface_always(&paint);
+        sk_tool_utils::set_portable_typeface(&paint);
         
         SkScalar width = SkIntToScalar(40);
         SkScalar height = SkIntToScalar(40);
         if (paint.getFontSpacing() > height) {
             height = paint.getFontSpacing();
         }
         for (unsigned i = 0; i < NUM_CONFIGS; i++) {
             const char* name = gColorTypeNames[src.colorType()];
             SkScalar textWidth = paint.measureText(name, strlen(name));
             if (textWidth > width) {
@@ skipping 25 matching lines @@
 
 private:
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new BitmapCopyGM; }
 static GMRegistry reg(MyFactory);
 }