| Index: src/effects/gradients/SkTwoPointConicalGradient.h
 | 
| diff --git a/src/effects/gradients/SkTwoPointConicalGradient.h b/src/effects/gradients/SkTwoPointConicalGradient.h
 | 
| index bff377ee794dbf52e1fe046d965e8d40ff50ca48..418c92dc61b2ccfeb0ebe13735417a7640a73b7e 100644
 | 
| --- a/src/effects/gradients/SkTwoPointConicalGradient.h
 | 
| +++ b/src/effects/gradients/SkTwoPointConicalGradient.h
 | 
| @@ -65,7 +65,7 @@ public:
 | 
|                                   SkMatrix* matrix,
 | 
|                                   TileMode* xy) const;
 | 
|      virtual SkShader::GradientType asAGradient(GradientInfo* info) const  SK_OVERRIDE;
 | 
| -    virtual bool asNewEffect(GrContext*, const SkPaint&, const SkMatrix*, GrColor* grColor,
 | 
| +    virtual bool asNewEffect(GrContext*, const SkPaint&, const SkMatrix*, GrColor* paintColor,
 | 
|                               GrEffect**) const SK_OVERRIDE;
 | 
|      virtual bool isOpaque() const SK_OVERRIDE;
 | 
|  
 | 
| 
 |