Revert of make gm background colors 565 compatible

gm/simpleaaclip.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"
@@ skipping 46 matching lines @@
         fBase.set(100.65f,
                   100.65f,
                   150.65f,
                   150.65f);
         fRect = fBase;
         fRect.inset(5, 5);
         fRect.offset(25, 25);
 
         fBasePath.addRoundRect(fBase, SkIntToScalar(5), SkIntToScalar(5));
         fRectPath.addRoundRect(fRect, SkIntToScalar(5), SkIntToScalar(5));
-        INHERITED::setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD));
+        INHERITED::setBGColor(0xFFDDDDDD);
     }
 
     void buildRgn(SkAAClip* clip, SkRegion::Op op) {
         clip->setPath(fBasePath, NULL, true);
 
         SkAAClip clip2;
         clip2.setPath(fRectPath, NULL, true);
         clip->op(clip2, op);
     }
 
@@ skipping 71 matching lines @@
             { SK_ColorBLACK,    "Difference", SkRegion::kDifference_Op    },
             { SK_ColorRED,      "Intersect",  SkRegion::kIntersect_Op     },
             { 0xFF008800,       "Union",      SkRegion::kUnion_Op         },
             { SK_ColorGREEN,    "Rev Diff",   SkRegion::kReverseDifference_Op },
             { SK_ColorYELLOW,   "Replace",    SkRegion::kReplace_Op       },
             { SK_ColorBLUE,     "XOR",        SkRegion::kXOR_Op           },
         };
 
         SkPaint textPaint;
         textPaint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface_always(&textPaint);
+        sk_tool_utils::set_portable_typeface(&textPaint);
         textPaint.setTextSize(SK_Scalar1*24);
         int xOff = 0;
 
         for (size_t op = 0; op < SK_ARRAY_COUNT(gOps); op++) {
             canvas->drawText(gOps[op].fName, strlen(gOps[op].fName),
                              SkIntToScalar(75), SkIntToScalar(50),
                              textPaint);
 
             if (kAAClip_GeomType == fGeomType) {
                 this->drawRgnOped(canvas, gOps[op].fOp, gOps[op].fColor);
@@ skipping 24 matching lines @@
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 // rects
 DEF_GM( return new SimpleClipGM(SimpleClipGM::kRect_GeomType); )
 DEF_GM( return new SimpleClipGM(SimpleClipGM::kPath_GeomType); )
 DEF_GM( return new SimpleClipGM(SimpleClipGM::kAAClip_GeomType); )
 
 }