| Index: src/effects/gradients/SkTwoPointConicalGradient.cpp
 | 
| diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp
 | 
| index 6e8fe4e2ab62bbefb6419a41fb4449bccdbdaa37..56b9458605440736946f1501da30c3db06deab8b 100644
 | 
| --- a/src/effects/gradients/SkTwoPointConicalGradient.cpp
 | 
| +++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp
 | 
| @@ -394,12 +394,12 @@ bool SkTwoPointConicalGradient::asFragmentProcessor(GrContext* context,
 | 
|                                                      const SkMatrix& viewM,
 | 
|                                                      const SkMatrix* localMatrix,
 | 
|                                                      GrColor* paintColor,
 | 
| -                                                    GrShaderDataManager* shaderDataManager,
 | 
| +                                                    GrProcessorDataManager* procDataManager,
 | 
|                                                      GrFragmentProcessor** fp)  const {
 | 
|      SkASSERT(context);
 | 
|      SkASSERT(fPtsToUnit.isIdentity());
 | 
|  
 | 
| -    *fp = Gr2PtConicalGradientEffect::Create(context, shaderDataManager, *this, fTileMode,
 | 
| +    *fp = Gr2PtConicalGradientEffect::Create(context, procDataManager, *this, fTileMode,
 | 
|                                               localMatrix);
 | 
|      *paintColor = SkColor2GrColorJustAlpha(paint.getColor());
 | 
|      return true;
 | 
| @@ -409,7 +409,7 @@ bool SkTwoPointConicalGradient::asFragmentProcessor(GrContext* context,
 | 
|  
 | 
|  bool SkTwoPointConicalGradient::asFragmentProcessor(GrContext*, const SkPaint&,
 | 
|                                                      const SkMatrix&, const SkMatrix*,
 | 
| -                                                    GrColor*, GrShaderDataManager*,
 | 
| +                                                    GrColor*, GrProcessorDataManager*,
 | 
|                                                      GrFragmentProcessor**)  const {
 | 
|      SkDEBUGFAIL("Should not call in GPU-less build");
 | 
|      return false;
 | 
| 
 |