SkShader::asNewEffect Refactoring

src/core/SkBitmapProcShader.h

Index: src/core/SkBitmapProcShader.h
diff --git a/src/core/SkBitmapProcShader.h b/src/core/SkBitmapProcShader.h
index 80e4550279ea2a1d8a8ad2630d28587a8b6b9f46..08e8397a735b05b31c6a1005c5d20bd985a61eb3 100644
--- a/src/core/SkBitmapProcShader.h
+++ b/src/core/SkBitmapProcShader.h
@@ -30,9 +30,9 @@ public:
     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
+

[dandov, 2014/06/09 19:10:55]

Remove this because of a previous comment from Jim, I added this macro to the
.cpp files where it was needed to have the same behavior as in Gradient shaders
where skdebugfail is called and returns false when the function is called in a
gpu-less environment. 

+    bool asNewEffect(GrContext*, const SkPaint&, const SkMatrix*, GrColor*, GrEffectRef**)
+            const SK_OVERRIDE;
 
     class BitmapProcShaderContext : public SkShader::Context {
     public: