commit 9de5b514d38c5b36066bcdc14fba2f7e5196d372
author dandov <dandov@google.com> Tue Jun 10 14:38:28 2014 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jun 10 14:38:28 2014 -0700
tree 8dfe270706133558dab7f076a27a0298ec38cc64
parent ce06c485a2d897eeb3e997ed6a546e77e99e47be

SkShader::asNewEffect Refactoring

The new signature is:

	bool asNewEffect(GrContext* context, const SkPaint& paint, GrColor* grColor, GrEffectRef** grEffect, const SkMatrix* localMatrixOrNull) const;

It will fix the hack for skcolorshader by modifying the GrColor parameter in SkGr::SkPaint2GrPaintShader.

BUG=skia:2646
R=jvanverth@google.com, bsalomon@google.com

Author: dandov@google.com

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

src/core/SkBitmapProcShader.h

diff --git a/src/core/SkBitmapProcShader.h b/src/core/SkBitmapProcShader.h
index 80e4550..08e8397 100644
--- a/src/core/SkBitmapProcShader.h
+++ b/src/core/SkBitmapProcShader.h
@@ -30,9 +30,9 @@
     SK_TO_STRING_OVERRIDE()
     SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkBitmapProcShader)
 
-#if SK_SUPPORT_GPU
-    GrEffectRef* asNewEffect(GrContext*, const SkPaint&, const SkMatrix*) const SK_OVERRIDE;
-#endif
+
+    bool asNewEffect(GrContext*, const SkPaint&, const SkMatrix*, GrColor*, GrEffectRef**)
+            const SK_OVERRIDE;
 
     class BitmapProcShaderContext : public SkShader::Context {
     public: