Remove support for inheriting the paint color from SkColorShader

bench/ShaderMaskBench.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 "SkBenchmark.h"
 #include "SkCanvas.h"
 #include "SkColorShader.h"
@@ skipping 26 matching lines @@
     SkString    fText;
     SkString    fName;
     FontQuality fFQ;
 public:
     ShaderMaskBench(bool isOpaque, FontQuality fq)  {
         fFQ = fq;
         fText.set(STR);
 
         fPaint.setAntiAlias(kBW != fq);
         fPaint.setLCDRenderText(kLCD == fq);
-        fPaint.setAlpha(isOpaque ? 0xFF : 0x80);
-        fPaint.setShader(new SkColorShader)->unref();
+        fPaint.setShader(new SkColorShader(isOpaque ? 0xFFFFFFFF : 0x80808080))->unref();
     }
 
 protected:
     virtual const char* onGetName() {
         fName.printf("shadermask");
         fName.appendf("_%s", fontQualityName(fPaint));
         fName.appendf("_%02X", fPaint.getAlpha());
         return fName.c_str();
     }
 
@@ skipping 31 matching lines @@
 };
 
 ///////////////////////////////////////////////////////////////////////////////
 
 DEF_BENCH( return new ShaderMaskBench(true,  kBW); )
 DEF_BENCH( return new ShaderMaskBench(false, kBW); )
 DEF_BENCH( return new ShaderMaskBench(true,  kAA); )
 DEF_BENCH( return new ShaderMaskBench(false, kAA); )
 DEF_BENCH( return new ShaderMaskBench(true,  kLCD); )
 DEF_BENCH( return new ShaderMaskBench(false, kLCD); )