Change SkShader;asFragmentProcessor signature to no longer take skpaint\grcolor*

src/effects/gradients/SkTwoPointConicalGradient.h

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkTwoPointConicalGradient_DEFINED
 #define SkTwoPointConicalGradient_DEFINED
@@ skipping 41 matching lines @@
         TwoPointConicalGradientContext(const SkTwoPointConicalGradient&, const ContextRec&);
         ~TwoPointConicalGradientContext() {}
 
         void shadeSpan(int x, int y, SkPMColor dstC[], int count) override;
 
     private:
         typedef SkGradientShaderBase::GradientShaderBaseContext INHERITED;
     };
 
     SkShader::GradientType asAGradient(GradientInfo* info) const  override;
-    bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix&, const SkMatrix*,
-                             GrColor*, GrProcessorDataManager*,
-                             GrFragmentProcessor**) const override;
+#if SK_SUPPORT_GPU
+    const GrFragmentProcessor* asFragmentProcessor(GrContext*, const SkMatrix&, const SkMatrix*,

[robertphillips, 2015/08/28 21:33:06]

tabs ?

[bsalomon, 2015/08/29 01:42:50]

Done.

+        SkFilterQuality, GrProcessorDataManager*) const override;
+#endif
     bool isOpaque() const override;
 
     SkScalar getCenterX1() const { return SkPoint::Distance(fCenter1, fCenter2); }
     SkScalar getStartRadius() const { return fRadius1; }
     SkScalar getDiffRadius() const { return fRadius2 - fRadius1; }
     const SkPoint& getStartCenter() const { return fCenter1; }
     const SkPoint& getEndCenter() const { return fCenter2; }
     SkScalar getEndRadius() const { return fRadius2; }
     bool isFlippedGrad() const { return fFlippedGrad; }
 
@@ skipping 10 matching lines @@
     SkPoint fCenter2;
     SkScalar fRadius1;
     SkScalar fRadius2;
     bool fFlippedGrad;
 
     friend class SkGradientShader;
     typedef SkGradientShaderBase INHERITED;
 };
 
 #endif