diff options
| author |  bsalomon <bsalomon@google.com> | 2014-07-08 09:56:10 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2014-07-08 09:56:11 -0700 |
| commit | 83d081ae1d731b5039e99823620f5e287542ee39 (patch) | |
| tree | 5deeda75fa4584b904a129dc4c1981f002b4cc14 /src/gpu/effects/GrOvalEffect.cpp | |
| parent | ca95c19d27b505a1ac8f57b53cb49c198bc29267 (diff) | |
Goodbye GrEffectRef.
Also, reworked some var names and comments around SkShader::asNewEffect.
R=robertphillips@google.com
Author: bsalomon@google.com
Review URL: https://codereview.chromium.org/374923002
Diffstat (limited to 'src/gpu/effects/GrOvalEffect.cpp')
| -rw-r--r-- | src/gpu/effects/GrOvalEffect.cpp | 34 |
1 files changed, 16 insertions, 18 deletions
diff --git a/src/gpu/effects/GrOvalEffect.cpp b/src/gpu/effects/GrOvalEffect.cpp index 678abd0c38..ddda4b902a 100644 --- a/src/gpu/effects/GrOvalEffect.cpp +++ b/src/gpu/effects/GrOvalEffect.cpp @@ -19,7 +19,7 @@ class GLCircleEffect; class CircleEffect : public GrEffect { public: - static GrEffectRef* Create(GrEffectEdgeType, const SkPoint& center, SkScalar radius); + static GrEffect* Create(GrEffectEdgeType, const SkPoint& center, SkScalar radius); virtual ~CircleEffect() {}; static const char* Name() { return "Circle"; } @@ -49,9 +49,7 @@ private: typedef GrEffect INHERITED; }; -GrEffectRef* CircleEffect::Create(GrEffectEdgeType edgeType, - const SkPoint& center, - SkScalar radius) { +GrEffect* CircleEffect::Create(GrEffectEdgeType edgeType, const SkPoint& center, SkScalar radius) { SkASSERT(radius >= 0); return SkNEW_ARGS(CircleEffect, (edgeType, center, radius)); } @@ -80,10 +78,10 @@ bool CircleEffect::onIsEqual(const GrEffect& other) const { GR_DEFINE_EFFECT_TEST(CircleEffect); -GrEffectRef* CircleEffect::TestCreate(SkRandom* random, - GrContext*, - const GrDrawTargetCaps& caps, - GrTexture*[]) { +GrEffect* CircleEffect::TestCreate(SkRandom* random, + GrContext*, + const GrDrawTargetCaps& caps, + GrTexture*[]) { SkPoint center; center.fX = random->nextRangeScalar(0.f, 1000.f); center.fY = random->nextRangeScalar(0.f, 1000.f); @@ -189,7 +187,7 @@ class GLEllipseEffect; class EllipseEffect : public GrEffect { public: - static GrEffectRef* Create(GrEffectEdgeType, const SkPoint& center, SkScalar rx, SkScalar ry); + static GrEffect* Create(GrEffectEdgeType, const SkPoint& center, SkScalar rx, SkScalar ry); virtual ~EllipseEffect() {}; static const char* Name() { return "Ellipse"; } @@ -219,10 +217,10 @@ private: typedef GrEffect INHERITED; }; -GrEffectRef* EllipseEffect::Create(GrEffectEdgeType edgeType, - const SkPoint& center, - SkScalar rx, - SkScalar ry) { +GrEffect* EllipseEffect::Create(GrEffectEdgeType edgeType, + const SkPoint& center, + SkScalar rx, + SkScalar ry) { SkASSERT(rx >= 0 && ry >= 0); return SkNEW_ARGS(EllipseEffect, (edgeType, center, rx, ry)); } @@ -251,10 +249,10 @@ bool EllipseEffect::onIsEqual(const GrEffect& other) const { GR_DEFINE_EFFECT_TEST(EllipseEffect); -GrEffectRef* EllipseEffect::TestCreate(SkRandom* random, - GrContext*, - const GrDrawTargetCaps& caps, - GrTexture*[]) { +GrEffect* EllipseEffect::TestCreate(SkRandom* random, + GrContext*, + const GrDrawTargetCaps& caps, + GrTexture*[]) { SkPoint center; center.fX = random->nextRangeScalar(0.f, 1000.f); center.fY = random->nextRangeScalar(0.f, 1000.f); @@ -366,7 +364,7 @@ void GLEllipseEffect::setData(const GrGLUniformManager& uman, const GrDrawEffect ////////////////////////////////////////////////////////////////////////////// -GrEffectRef* GrOvalEffect::Create(GrEffectEdgeType edgeType, const SkRect& oval) { +GrEffect* GrOvalEffect::Create(GrEffectEdgeType edgeType, const SkRect& oval) { if (kHairlineAA_GrEffectEdgeType == edgeType) { return NULL; } |