Index: src/effects/SkColorMatrixFilter.cpp |
diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp |
index bf098c840f8194ad9fadb8c4215f7e46e280b642..566704849be0cf21ef4c210765c3a8e191e278e5 100644 |
--- a/src/effects/SkColorMatrixFilter.cpp |
+++ b/src/effects/SkColorMatrixFilter.cpp |
@@ -399,15 +399,15 @@ |
class GLEffect : public GrGLEffect { |
public: |
// this class always generates the same code. |
- static void GenKey(const GrEffect&, const GrGLCaps&, GrEffectKeyBuilder* b) {} |
+ static void GenKey(const GrDrawEffect&, const GrGLCaps&, GrEffectKeyBuilder* b) {} |
GLEffect(const GrBackendEffectFactory& factory, |
- const GrEffect&) |
+ const GrDrawEffect&) |
: INHERITED(factory) { |
} |
virtual void emitCode(GrGLProgramBuilder* builder, |
- const GrEffect&, |
+ const GrDrawEffect&, |
const GrEffectKey&, |
const char* outputColor, |
const char* inputColor, |
@@ -438,8 +438,8 @@ |
} |
virtual void setData(const GrGLProgramDataManager& uniManager, |
- const GrEffect& effect) SK_OVERRIDE { |
- const ColorMatrixEffect& cme = effect.cast<ColorMatrixEffect>(); |
+ const GrDrawEffect& drawEffect) SK_OVERRIDE { |
+ const ColorMatrixEffect& cme = drawEffect.castEffect<ColorMatrixEffect>(); |
const float* m = cme.fMatrix.fMat; |
// The GL matrix is transposed from SkColorMatrix. |
GrGLfloat mt[] = { |
@@ -467,7 +467,7 @@ |
ColorMatrixEffect(const SkColorMatrix& matrix) : fMatrix(matrix) {} |
virtual bool onIsEqual(const GrEffect& s) const { |
- const ColorMatrixEffect& cme = s.cast<ColorMatrixEffect>(); |
+ const ColorMatrixEffect& cme = CastEffect<ColorMatrixEffect>(s); |
return cme.fMatrix == fMatrix; |
} |