Revert of make gm background colors 565 compatible

gm/constcolorprocessor.cpp

 
 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 // This test only works with the GPU backend.
 
 #include "gm.h"
 
 #if SK_SUPPORT_GPU
 
 #include "GrContext.h"
 #include "GrTest.h"
 #include "effects/GrConstColorProcessor.h"
 #include "SkGr.h"
 #include "SkGradientShader.h"
 
 namespace skiagm {
 /**
  * This GM directly exercises GrConstColorProcessor.
  */
 class ConstColorProcessor : public GM {
 public:
     ConstColorProcessor() {
-        this->setBGColor(sk_tool_utils::color_to_565(0xFFDDDDDD));
+        this->setBGColor(0xFFDDDDDD);
     }
 
 protected:
     SkString onShortName() override {
         return SkString("const_color_processor");
     }
 
     SkISize onISize() override {
         return SkISize::Make(kWidth, kHeight);
     }
@@ skipping 78 matching lines @@
                     pipelineBuilder.addColorProcessor(fp);
 
                     tt.target()->drawSimpleRect(&pipelineBuilder,
                                                 grPaint.getColor(),
                                                 viewMatrix,
                                                 renderRect);
 
                     // Draw labels for the input to the processor and the processor to the right of
                     // the test rect. The input label appears above the processor label.
                     SkPaint labelPaint;
-                    sk_tool_utils::set_portable_typeface_always(&labelPaint);
                     labelPaint.setAntiAlias(true);
                     labelPaint.setTextSize(10.f);
                     SkString inputLabel;
                     inputLabel.set("Input: ");
                     if (paintType >= SK_ARRAY_COUNT(kPaintColors)) {
                         inputLabel.append("gradient");
                     } else {
                         inputLabel.appendf("0x%08x", kPaintColors[paintType]);
                     }
                     SkString procLabel;
@@ skipping 52 matching lines @@
     typedef GM INHERITED;
 };
 
 const SkScalar ConstColorProcessor::kPad = 10.f;
 const SkScalar ConstColorProcessor::kRectSize = 20.f;
 
 DEF_GM( return SkNEW(ConstColorProcessor); )
 }
 
 #endif