Remove support for inheriting the paint color from SkColorShader

BUG=skia:2453
R=reed@google.com, mtklein@google.com

Author: bsalomon@google.com

Review URL: https://codereview.chromium.org/248033003

git-svn-id: http://skia.googlecode.com/svn/trunk@14355 2bbb7eff-a529-9590-31e7-b0007b416f81

2 files changed, 1 insertions, 133 deletions

diff --git a/bench/ShaderMaskBench.cpp b/bench/ShaderMaskBench.cpp
index bf04981bec..7323d8ee7a 100644
--- a/bench/ShaderMaskBench.cpp
+++ b/bench/ShaderMaskBench.cpp
@@ -44,8 +44,7 @@ public:
 
         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:
diff --git a/bench/valgrind.supp b/bench/valgrind.supp
index e6b15b4fd4..0ed963d110 100644
--- a/bench/valgrind.supp
+++ b/bench/valgrind.supp
@@ -81,134 +81,3 @@
    fun:_Z9tool_mainiPPc
    fun:(below main)
 }
-{
-   shadermask_LCD_* http://skbug.com/2453
-   Memcheck:Cond
-   fun:_ZL16SkMulDiv255Roundjj
-   fun:_ZN12_GLOBAL__N_121skPaint2GrPaintShaderEP11SkGpuDeviceRK7SkPaintbP7GrPaint
-   fun:_ZN11SkGpuDevice8drawTextERK6SkDrawPKvmffRK7SkPaint
-   fun:_ZN8SkCanvas8drawTextEPKvmffRK7SkPaint
-   fun:_ZN15ShaderMaskBench6onDrawEiP8SkCanvas
-   fun:_ZN11SkBenchmark4drawEiP8SkCanvas
-   fun:_Z9tool_mainiPPc
-   fun:main
-}
-{
-   shadermask_LCD_* 2 http://skbug.com/2453
-   Memcheck:Cond
-   fun:_ZL8SkMulS16ii
-   fun:_ZL16SkMulDiv255Roundjj
-   fun:_ZN12_GLOBAL__N_121skPaint2GrPaintShaderEP11SkGpuDeviceRK7SkPaintbP7GrPaint
-   fun:_ZN11SkGpuDevice8drawTextERK6SkDrawPKvmffRK7SkPaint
-   fun:_ZN8SkCanvas8drawTextEPKvmffRK7SkPaint
-   fun:_ZN15ShaderMaskBench6onDrawEiP8SkCanvas
-   fun:_ZN11SkBenchmark4drawEiP8SkCanvas
-   fun:_Z9tool_mainiPPc
-   fun:main
-}
-{
-   shadermask_LCD_* 3 http://skbug.com/2453
-   Memcheck:Cond
-   fun:_ZL23SkPremultiplyARGBInlinejjjj
-   fun:_Z18SkPreMultiplyColorj
-   fun:_ZL15SkColor2GrColorj
-   fun:_ZN12_GLOBAL__N_123skPaint2GrPaintNoShaderEP11SkGpuDeviceRK7SkPaintbbP7GrPaint
-   fun:_ZN12_GLOBAL__N_121skPaint2GrPaintShaderEP11SkGpuDeviceRK7SkPaintbP7GrPaint
-   fun:_ZN11SkGpuDevice8drawTextERK6SkDrawPKvmffRK7SkPaint
-   fun:_ZN8SkCanvas8drawTextEPKvmffRK7SkPaint
-   fun:_ZN15ShaderMaskBench6onDrawEiP8SkCanvas
-   fun:_ZN11SkBenchmark4drawEiP8SkCanvas
-   fun:_Z9tool_mainiPPc
-   fun:main
-}
-{
-   shadermask_LCD_* 4 http://skbug.com/2453
-   Memcheck:Cond
-   fun:_ZL16SkMulDiv255Roundjj
-   fun:_ZL23SkPremultiplyARGBInlinejjjj
-   fun:_Z18SkPreMultiplyColorj
-   fun:_ZL15SkColor2GrColorj
-   fun:_ZN12_GLOBAL__N_123skPaint2GrPaintNoShaderEP11SkGpuDeviceRK7SkPaintbbP7GrPaint
-   fun:_ZN12_GLOBAL__N_121skPaint2GrPaintShaderEP11SkGpuDeviceRK7SkPaintbP7GrPaint
-   fun:_ZN11SkGpuDevice8drawTextERK6SkDrawPKvmffRK7SkPaint
-   fun:_ZN8SkCanvas8drawTextEPKvmffRK7SkPaint
-   fun:_ZN15ShaderMaskBench6onDrawEiP8SkCanvas
-   fun:_ZN11SkBenchmark4drawEiP8SkCanvas
-   fun:_Z9tool_mainiPPc
-   fun:main
-}
-{
-   shadermask_LCD_* 5 http://skbug.com/2453
-   Memcheck:Cond
-   fun:_ZL16SkMulDiv255Roundjj
-   fun:_ZL23SkPremultiplyARGBInlinejjjj
-   fun:_Z18SkPreMultiplyColorj
-   fun:_ZL15SkColor2GrColorj
-   fun:_ZN12_GLOBAL__N_123skPaint2GrPaintNoShaderEP11SkGpuDeviceRK7SkPaintbbP7GrPaint
-   fun:_ZN12_GLOBAL__N_121skPaint2GrPaintShaderEP11SkGpuDeviceRK7SkPaintbP7GrPaint
-   fun:_ZN11SkGpuDevice8drawTextERK6SkDrawPKvmffRK7SkPaint
-   fun:_ZN8SkCanvas8drawTextEPKvmffRK7SkPaint
-   fun:_ZN15ShaderMaskBench6onDrawEiP8SkCanvas
-   fun:_ZN11SkBenchmark4drawEiP8SkCanvas
-   fun:_Z9tool_mainiPPc
-   fun:main
-}
-{
-   shadermask_LCD_* 6 http://skbug.com/2453
-   Memcheck:Cond
-   fun:_ZL8SkMulS16ii
-   fun:_ZL16SkMulDiv255Roundjj
-   fun:_ZL23SkPremultiplyARGBInlinejjjj
-   fun:_Z18SkPreMultiplyColorj
-   fun:_ZL15SkColor2GrColorj
-   fun:_ZN12_GLOBAL__N_123skPaint2GrPaintNoShaderEP11SkGpuDeviceRK7SkPaintbbP7GrPaint
-   fun:_ZN12_GLOBAL__N_121skPaint2GrPaintShaderEP11SkGpuDeviceRK7SkPaintbP7GrPaint
-   fun:_ZN11SkGpuDevice8drawTextERK6SkDrawPKvmffRK7SkPaint
-   fun:_ZN8SkCanvas8drawTextEPKvmffRK7SkPaint
-   fun:_ZN15ShaderMaskBench6onDrawEiP8SkCanvas
-   fun:_ZN11SkBenchmark4drawEiP8SkCanvas
-   fun:_Z9tool_mainiPPc
-}
-{
-   shadermask_LCD_* 7 http://skbug.com/2453
-   Memcheck:Cond
-   fun:_ZL12SkPackARGB32jjjj
-   fun:_ZL23SkPremultiplyARGBInlinejjjj
-   fun:_Z18SkPreMultiplyColorj
-   fun:_ZL15SkColor2GrColorj
-   fun:_ZN12_GLOBAL__N_123skPaint2GrPaintNoShaderEP11SkGpuDeviceRK7SkPaintbbP7GrPaint
-   fun:_ZN12_GLOBAL__N_121skPaint2GrPaintShaderEP11SkGpuDeviceRK7SkPaintbP7GrPaint
-   fun:_ZN11SkGpuDevice8drawTextERK6SkDrawPKvmffRK7SkPaint
-   fun:_ZN8SkCanvas8drawTextEPKvmffRK7SkPaint
-   fun:_ZN15ShaderMaskBench6onDrawEiP8SkCanvas
-   fun:_ZN11SkBenchmark4drawEiP8SkCanvas
-   fun:_Z9tool_mainiPPc
-   fun:main
-}
-{
-   shadermask_LCD_* 8 http://skbug.com/2453
-   Memcheck:Cond
-   fun:_ZL15GrColorPackRGBAjjjj
-   fun:_ZL15SkColor2GrColorj
-   fun:_ZN12_GLOBAL__N_123skPaint2GrPaintNoShaderEP11SkGpuDeviceRK7SkPaintbbP7GrPaint
-   fun:_ZN12_GLOBAL__N_121skPaint2GrPaintShaderEP11SkGpuDeviceRK7SkPaintbP7GrPaint
-   fun:_ZN11SkGpuDevice8drawTextERK6SkDrawPKvmffRK7SkPaint
-   fun:_ZN8SkCanvas8drawTextEPKvmffRK7SkPaint
-   fun:_ZN15ShaderMaskBench6onDrawEiP8SkCanvas
-   fun:_ZN11SkBenchmark4drawEiP8SkCanvas
-   fun:_Z9tool_mainiPPc
-   fun:main
-}
-{
-   shadermask_LCD_* Release http://skbug.com/2453
-   Memcheck:Cond
-   fun:_Z18SkPreMultiplyColorj
-   fun:_ZN12_GLOBAL__N_123skPaint2GrPaintNoShaderEP11SkGpuDeviceRK7SkPaintbbP7GrPaint
-   fun:_ZN12_GLOBAL__N_121skPaint2GrPaintShaderEP11SkGpuDeviceRK7SkPaintbP7GrPaint.constprop.127
-   fun:_ZN11SkGpuDevice8drawTextERK6SkDrawPKvmffRK7SkPaint
-   fun:_ZN8SkCanvas8drawTextEPKvmffRK7SkPaint
-   fun:_ZN15ShaderMaskBench6onDrawEiP8SkCanvas
-   fun:_Z9tool_mainiPPc
-   fun:(below main)
-}
-