Revert of make gm background colors 565 compatible

gm/complexclip3.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"
 #include "SkCanvas.h"
 #include "SkPath.h"
 
 namespace skiagm {
 
 static const SkColor gPathColor = SK_ColorYELLOW;
 
 class ComplexClip3GM : public GM {
 public:
     ComplexClip3GM(bool doSimpleClipFirst)
         : fDoSimpleClipFirst(doSimpleClipFirst) {
-        this->setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD));
+        this->setBGColor(0xFFDDDDDD);
     }
 
 protected:
 
     SkString onShortName() {
         SkString str;
         str.printf("complexclip3_%s", fDoSimpleClipFirst ? "simple" : "complex");
         return str;
     }    
 
@@ skipping 11 matching lines @@
 
         SkPath* firstClip = &clipSimple;
         SkPath* secondClip = &clipComplex;
 
         if (!fDoSimpleClipFirst) {
             SkTSwap<SkPath*>(firstClip, secondClip);
         }
 
         SkPaint paint;
         paint.setAntiAlias(true);
-        sk_tool_utils::set_portable_typeface_always(&paint);
+        sk_tool_utils::set_portable_typeface(&paint);
         paint.setTextSize(SkIntToScalar(20));
 
         static const struct {
             SkRegion::Op fOp;
             const char*  fName;
         } gOps[] = {
             {SkRegion::kIntersect_Op,         "I"},
             {SkRegion::kDifference_Op,        "D" },
             {SkRegion::kUnion_Op,             "U"},
             {SkRegion::kXOR_Op,               "X"  },
@@ skipping 61 matching lines @@
     typedef GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 // Simple clip first
 DEF_GM( return new ComplexClip3GM(true); )
 // Complex clip first
 DEF_GM( return new ComplexClip3GM(false); )
 }