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