| Index: src/core/SkShader.cpp | 
| diff --git a/src/core/SkShader.cpp b/src/core/SkShader.cpp | 
| index 32984960ab27f7c0709587c8b51f6b27b270b425..d1f66117273c8155edc483a93bb9465f00816deb 100644 | 
| --- a/src/core/SkShader.cpp | 
| +++ b/src/core/SkShader.cpp | 
| @@ -215,7 +215,7 @@ SkShader::GradientType SkShader::asAGradient(GradientInfo* info) const { | 
| } | 
|  | 
| bool SkShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, const SkMatrix*, | 
| -                                   GrColor*, GrFragmentProcessor**)  const { | 
| +                                   GrColor*, GrShaderDataManager*, GrFragmentProcessor**)  const { | 
| return false; | 
| } | 
|  | 
| @@ -346,7 +346,7 @@ SkShader::GradientType SkColorShader::asAGradient(GradientInfo* info) const { | 
| #include "SkGr.h" | 
|  | 
| bool SkColorShader::asFragmentProcessor(GrContext*, const SkPaint& paint, const SkMatrix&, | 
| -                                        const SkMatrix*, GrColor* paintColor, | 
| +                                        const SkMatrix*, GrColor* paintColor, GrShaderDataManager*, | 
| GrFragmentProcessor** fp) const { | 
| *fp = NULL; | 
| SkColor skColor = fColor; | 
| @@ -358,7 +358,7 @@ bool SkColorShader::asFragmentProcessor(GrContext*, const SkPaint& paint, const | 
| #else | 
|  | 
| bool SkColorShader::asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, | 
| -                                        const SkMatrix*, GrColor*, | 
| +                                        const SkMatrix*, GrColor*, GrShaderDataManager*, | 
| GrFragmentProcessor**) const { | 
| SkDEBUGFAIL("Should not call in GPU-less build"); | 
| return false; | 
|  |