| Index: src/effects/gradients/SkLinearGradient.cpp
|
| diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp
|
| index b26d60626b0b2a51d7c9894160932240153e26fe..d978e5ada044c1f304e5818148351e0909f8a162 100644
|
| --- a/src/effects/gradients/SkLinearGradient.cpp
|
| +++ b/src/effects/gradients/SkLinearGradient.cpp
|
| @@ -468,21 +468,21 @@ void SkLinearGradient::LinearGradientContext::shadeSpan16(int x, int y,
|
| class GrGLLinearGradient : public GrGLGradientEffect {
|
| public:
|
|
|
| - GrGLLinearGradient(const GrBackendEffectFactory& factory, const GrDrawEffect&)
|
| + GrGLLinearGradient(const GrBackendEffectFactory& factory, const GrEffect&)
|
| : INHERITED (factory) { }
|
|
|
| virtual ~GrGLLinearGradient() { }
|
|
|
| virtual void emitCode(GrGLProgramBuilder*,
|
| - const GrDrawEffect&,
|
| + const GrEffect&,
|
| const GrEffectKey&,
|
| const char* outputColor,
|
| const char* inputColor,
|
| const TransformedCoordsArray&,
|
| const TextureSamplerArray&) SK_OVERRIDE;
|
|
|
| - static void GenKey(const GrDrawEffect& drawEffect, const GrGLCaps&, GrEffectKeyBuilder* b) {
|
| - b->add32(GenBaseGradientKey(drawEffect));
|
| + static void GenKey(const GrEffect& effect, const GrGLCaps&, GrEffectKeyBuilder* b) {
|
| + b->add32(GenBaseGradientKey(effect));
|
| }
|
|
|
| private:
|
| @@ -551,7 +551,7 @@ GrEffect* GrLinearGradient::TestCreate(SkRandom* random,
|
| /////////////////////////////////////////////////////////////////////
|
|
|
| void GrGLLinearGradient::emitCode(GrGLProgramBuilder* builder,
|
| - const GrDrawEffect&,
|
| + const GrEffect&,
|
| const GrEffectKey& key,
|
| const char* outputColor,
|
| const char* inputColor,
|
|
|