| Index: src/gpu/effects/GrConfigConversionEffect.cpp
 | 
| diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp
 | 
| index daf51414f2943a72050bafeb9f530f03590ea6f3..7c1cf07dfac5c976bf4d5b1bd8075980782c7afc 100644
 | 
| --- a/src/gpu/effects/GrConfigConversionEffect.cpp
 | 
| +++ b/src/gpu/effects/GrConfigConversionEffect.cpp
 | 
| @@ -26,7 +26,7 @@ public:
 | 
|                            const GrDrawEffect&,
 | 
|                            EffectKey key,
 | 
|                            const char* outputColor,
 | 
| -                          const char* inputColor,
 | 
| +                          const GrGLSLExpr4& inputColor,
 | 
|                            const TransformedCoordsArray& coords,
 | 
|                            const TextureSamplerArray& samplers) SK_OVERRIDE {
 | 
|          builder->fsCodeAppendf("\t\t%s = ", outputColor);
 | 
| 
 |