Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / third_party / skia / src / effects / gradients / SkTwoPointConicalGradient.h

diff --git a/src/third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.h b/src/third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.h
index fc39046..c43f682 100644 (file)
--- a/src/third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.h
+++ b/src/third_party/skia/src/effects/gradients/SkTwoPointConicalGradient.h
@@ -64,8 +64,8 @@ public:
                                  SkMatrix* matrix,
                                  TileMode* xy) const;
     virtual SkShader::GradientType asAGradient(GradientInfo* info) const  SK_OVERRIDE;
-    virtual bool asNewEffect(GrContext*, const SkPaint&, const SkMatrix*, GrColor* paintColor,
-                             GrEffect**) const SK_OVERRIDE;
+    virtual bool asFragmentProcessor(GrContext*, const SkPaint&, const SkMatrix*, GrColor*,
+                                     GrFragmentProcessor**) const SK_OVERRIDE;
     virtual bool isOpaque() const SK_OVERRIDE;
 
     SkScalar getCenterX1() const { return SkPoint::Distance(fCenter1, fCenter2); }
@@ -91,6 +91,7 @@ private:
     SkScalar fRadius2;
     bool fFlippedGrad;
 
+    friend class SkGradientShader;
     typedef SkGradientShaderBase INHERITED;
 };