Remove support for inheriting the paint color from SkColorShader

Remove support for inheriting the paint color from SkColorShader

BUG=skia:2453
Committed: http://code.google.com/p/skia/source/detail?r=14355

[bsalomon, 2014-04-22 21:44:15]

Remove inherited color feature from SkColorShader. We're barely using it. Chrome
and Android don't use it. It doesn't work with the GPU backend as the GPU
backend doesn't call setContext(). This causes shaderMask benches to trigger a
branch on uninit memory error in valgrind.

[reed1, 2014-04-22 21:48:49]

if chrome/android don't use it, kill kill kill

[mtklein, 2014-04-22 21:49:07]

https://codereview.chromium.org/248033003/diff/40001/include/core/SkColorShad...
File include/core/SkColorShader.h (right):

https://codereview.chromium.org/248033003/diff/40001/include/core/SkColorShad...
include/core/SkColorShader.h:26: SkColorShader(SkColor c);
Might take the opportunity to tag this as explicit.

https://codereview.chromium.org/248033003/diff/40001/include/core/SkPicture.h
File include/core/SkPicture.h (right):

https://codereview.chromium.org/248033003/diff/40001/include/core/SkPicture.h...
include/core/SkPicture.h:327: // V25: SkDashPathEffect now only writes phase and
interval array when flattening
Add a note about the change?

https://codereview.chromium.org/248033003/diff/40001/src/core/SkShader.cpp
File src/core/SkShader.cpp (right):

https://codereview.chromium.org/248033003/diff/40001/src/core/SkShader.cpp#ne...
src/core/SkShader.cpp:216: // An older version had a boolean to make the color
shader inherit the paint's color. We don't
Can you add // V25_COMPATIBILITY_CODE here to make it easier to grep and remove
later?

https://codereview.chromium.org/248033003/diff/40001/src/core/SkShader.cpp#ne...
src/core/SkShader.cpp:219: if (b.readBool()) {
Replace with SkAssertResult(!b.readBool())?

[bsalomon, 2014-04-23 15:22:28]

https://codereview.chromium.org/248033003/diff/40001/include/core/SkColorShad...
File include/core/SkColorShader.h (right):

https://codereview.chromium.org/248033003/diff/40001/include/core/SkColorShad...
include/core/SkColorShader.h:26: SkColorShader(SkColor c);
On 2014/04/22 21:49:07, mtklein wrote:
> Might take the opportunity to tag this as explicit.

Done.

https://codereview.chromium.org/248033003/diff/40001/include/core/SkPicture.h
File include/core/SkPicture.h (right):

https://codereview.chromium.org/248033003/diff/40001/include/core/SkPicture.h...
include/core/SkPicture.h:327: // V25: SkDashPathEffect now only writes phase and
interval array when flattening
On 2014/04/22 21:49:07, mtklein wrote:
> Add a note about the change?

Done.

https://codereview.chromium.org/248033003/diff/40001/src/core/SkShader.cpp
File src/core/SkShader.cpp (right):

https://codereview.chromium.org/248033003/diff/40001/src/core/SkShader.cpp#ne...
src/core/SkShader.cpp:219: if (b.readBool()) {
On 2014/04/22 21:49:07, mtklein wrote:
> Replace with SkAssertResult(!b.readBool())?

I added an SkDebugFail just after sending out the initial comment :)

[mtklein, 2014-04-23 15:33:23]

On 2014/04/23 15:22:28, bsalomon wrote:
>
https://codereview.chromium.org/248033003/diff/40001/include/core/SkColorShad...
> File include/core/SkColorShader.h (right):
> 
>
https://codereview.chromium.org/248033003/diff/40001/include/core/SkColorShad...
> include/core/SkColorShader.h:26: SkColorShader(SkColor c);
> On 2014/04/22 21:49:07, mtklein wrote:
> > Might take the opportunity to tag this as explicit.
> 
> Done.
> 
> https://codereview.chromium.org/248033003/diff/40001/include/core/SkPicture.h
> File include/core/SkPicture.h (right):
> 
>
https://codereview.chromium.org/248033003/diff/40001/include/core/SkPicture.h...
> include/core/SkPicture.h:327: // V25: SkDashPathEffect now only writes phase
and
> interval array when flattening
> On 2014/04/22 21:49:07, mtklein wrote:
> > Add a note about the change?
> 
> Done.
> 
> https://codereview.chromium.org/248033003/diff/40001/src/core/SkShader.cpp
> File src/core/SkShader.cpp (right):
> 
>
https://codereview.chromium.org/248033003/diff/40001/src/core/SkShader.cpp#ne...
> src/core/SkShader.cpp:219: if (b.readBool()) {
> On 2014/04/22 21:49:07, mtklein wrote:
> > Replace with SkAssertResult(!b.readBool())?
> 
> I added an SkDebugFail just after sending out the initial comment :)

lgtm

[bsalomon, 2014-04-23 15:34:00]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2014-04-23 15:34:16]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/bsalomon@google.com/248033003/100001

[commit-bot: I haz the power, 2014-04-23 15:34:23]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-23 15:34:24]

Failed to apply patch for include/core/SkColorShader.h:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file include/core/SkColorShader.h
  Hunk #1 succeeded at 19 with fuzz 2.
  Hunk #2 succeeded at 60 (offset 19 lines).
  Hunk #3 FAILED at 56.
  1 out of 3 hunks FAILED -- saving rejects to file
include/core/SkColorShader.h.rej

Patch:       include/core/SkColorShader.h
Index: include/core/SkColorShader.h
diff --git a/include/core/SkColorShader.h b/include/core/SkColorShader.h
index
975156c0eb3a9e10120a02a92070030a72d3912e..18a0023613321a27db1baeac82eeed1010ef6487
100644
--- a/include/core/SkColorShader.h
+++ b/include/core/SkColorShader.h
@@ -19,16 +19,11 @@
 */
 class SK_API SkColorShader : public SkShader {
 public:
-    /** Create a ColorShader that will inherit its color from the Paint
-        at draw time.
-    */
-    SkColorShader();
-
     /** Create a ColorShader that ignores the color in the paint, and uses the
         specified color. Note: like all shaders, at draw time the paint's alpha
         will be respected, and is applied to the specified color.
     */
-    SkColorShader(SkColor c);
+    explicit SkColorShader(SkColor c);
 
     virtual ~SkColorShader();
 
@@ -46,7 +41,7 @@ public:
                                  SkMatrix* outMatrix,
                                  TileMode xy[2]) const SK_OVERRIDE;
 
-    virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE;
+    virtual GradientType asAGradient(GradientInfo* info) const SK_OVERRIDE; 
 
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkColorShader)
@@ -61,7 +56,6 @@ private:
     SkPMColor   fPMColor;       // cached after setContext()
     uint32_t    fFlags;         // cached after setContext()
     uint16_t    fColor16;       // cached after setContext()
-    SkBool8     fInheritColor;
 
     typedef SkShader INHERITED;
 };

[bsalomon, 2014-04-24 14:39:38]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2014-04-24 14:39:58]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/bsalomon@google.com/248033003/120001

[commit-bot: I haz the power, 2014-04-24 15:08:20]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2014-04-24 15:08:20]

Retried try job too often on Build-Ubuntu12-GCC-x86_64-Release-Trybot for
step(s) BuildGm
http://skia-tree-status.appspot.com/redirect/compile-buildbots/buildstatus?bu...

[bsalomon, 2014-04-24 15:20:03]

The CQ bit was checked by bsalomon@google.com

[commit-bot: I haz the power, 2014-04-24 15:20:22]

CQ is trying da patch. Follow status at
https://skia-tree-status.appspot.com/cq/bsalomon@google.com/248033003/140001

[commit-bot: I haz the power, 2014-04-24 16:54:55]

Change committed as 14355