Change some function/vars from EffectPtr to EffectRef to reflect GrEffectPtr->GrEffectRef renaming.

git-svn-id: http://skia.googlecode.com/svn/trunk@7226 2bbb7eff-a529-9590-31e7-b0007b416f81

18 files changed, 27 insertions, 27 deletions

diff --git a/src/effects/SkBlendImageFilter.cpp b/src/effects/SkBlendImageFilter.cpp
index d9fb320f65..5a93b479d2 100644
--- a/src/effects/SkBlendImageFilter.cpp
+++ b/src/effects/SkBlendImageFilter.cpp
@@ -147,7 +147,7 @@ public:
                                GrTexture* foreground,
                                GrTexture* background) {
         SkAutoTUnref<GrEffect> effect(SkNEW_ARGS(GrBlendEffect, (mode, foreground, background)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
     }
 
     virtual ~GrBlendEffect();
diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp
index 85f6ccd21d..0fb438d2f4 100644
--- a/src/effects/SkColorMatrixFilter.cpp
+++ b/src/effects/SkColorMatrixFilter.cpp
@@ -327,7 +327,7 @@ class ColorMatrixEffect : public GrEffect {
 public:
     static GrEffectRef* Create(const SkColorMatrix& matrix) {
         SkAutoTUnref<GrEffect> effect(SkNEW_ARGS(ColorMatrixEffect, (matrix)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
     }
 
     static const char* Name() { return "Color Matrix"; }
diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
index 36ca6af813..9a67ac36c7 100644
--- a/src/effects/SkDisplacementMapEffect.cpp
+++ b/src/effects/SkDisplacementMapEffect.cpp
@@ -240,7 +240,7 @@ public:
                                                                            scale,
                                                                            displacement,
                                                                            color)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
     }
 
     virtual ~GrDisplacementMapEffect();
diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp
index 337e883403..ddb033def3 100644
--- a/src/effects/SkLightingImageFilter.cpp
+++ b/src/effects/SkLightingImageFilter.cpp
@@ -334,7 +334,7 @@ public:
                                                                            light,
                                                                            surfaceScale,
                                                                            kd)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
     }
 
     static const char* Name() { return "DiffuseLighting"; }
@@ -367,7 +367,7 @@ public:
                                                                             surfaceScale,
                                                                             ks,
                                                                             shininess)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
     }
     static const char* Name() { return "SpecularLighting"; }
 
diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp
index 9b57bdcd65..e7f266eeff 100644
--- a/src/effects/SkMagnifierImageFilter.cpp
+++ b/src/effects/SkMagnifierImageFilter.cpp
@@ -40,7 +40,7 @@ public:
                                                                      yZoom,
                                                                      xInset,
                                                                      yInset)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
     }
 
     virtual ~GrMagnifierEffect() {};
diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp
index 690cdd8239..03b10be041 100644
--- a/src/effects/SkMatrixConvolutionImageFilter.cpp
+++ b/src/effects/SkMatrixConvolutionImageFilter.cpp
@@ -263,7 +263,7 @@ public:
                                                                              target,
                                                                              tileMode,
                                                                              convolveAlpha)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
     }
     virtual ~GrMatrixConvolutionEffect();
 
diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp
index 7ce76c8af3..ed30aca8b2 100644
--- a/src/effects/SkMorphologyImageFilter.cpp
+++ b/src/effects/SkMorphologyImageFilter.cpp
@@ -245,7 +245,7 @@ public:
 
     static GrEffectRef* Create(GrTexture* tex, Direction dir, int radius, MorphologyType type) {
         SkAutoTUnref<GrEffect> effect(SkNEW_ARGS(GrMorphologyEffect, (tex, dir, radius, type)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
     }
 
     virtual ~GrMorphologyEffect();
diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp
index 7c2b4dfd1a..0a922e712a 100644
--- a/src/effects/SkTableColorFilter.cpp
+++ b/src/effects/SkTableColorFilter.cpp
@@ -228,7 +228,7 @@ class ColorTableEffect : public GrEffect {
 public:
     static GrEffectRef* Create(GrTexture* texture, unsigned flags) {
         SkAutoTUnref<GrEffect> effect(SkNEW_ARGS(ColorTableEffect, (texture, flags)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
     }
 
     virtual ~ColorTableEffect();
diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp
index 8daa5caf7c..6bb0329dd1 100644
--- a/src/effects/gradients/SkLinearGradient.cpp
+++ b/src/effects/gradients/SkLinearGradient.cpp
@@ -489,7 +489,7 @@ public:
                                const SkMatrix& matrix,
                                SkShader::TileMode tm) {
         SkAutoTUnref<GrEffect> effect(SkNEW_ARGS(GrLinearGradient, (ctx, shader, matrix, tm)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
     }
 
     virtual ~GrLinearGradient() { }
diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp
index dea13222c1..c380ec1730 100644
--- a/src/effects/gradients/SkRadialGradient.cpp
+++ b/src/effects/gradients/SkRadialGradient.cpp
@@ -509,7 +509,7 @@ public:
                                const SkMatrix& matrix,
                                SkShader::TileMode tm) {
         SkAutoTUnref<GrEffect> effect(SkNEW_ARGS(GrRadialGradient, (ctx, shader, matrix, tm)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
     }
 
     virtual ~GrRadialGradient() { }
diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp
index 810c9dec11..3a1a599ec0 100644
--- a/src/effects/gradients/SkSweepGradient.cpp
+++ b/src/effects/gradients/SkSweepGradient.cpp
@@ -417,7 +417,7 @@ public:
                                const SkSweepGradient& shader,
                                const SkMatrix& matrix) {
         SkAutoTUnref<GrEffect> effect(SkNEW_ARGS(GrSweepGradient, (ctx, shader, matrix)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
     }
     virtual ~GrSweepGradient() { }
 
diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp
index 1552149839..0a154246c3 100644
--- a/src/effects/gradients/SkTwoPointConicalGradient.cpp
+++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp
@@ -374,7 +374,7 @@ public:
                                const SkMatrix& matrix,
                                SkShader::TileMode tm) {
         SkAutoTUnref<GrEffect> effect(SkNEW_ARGS(GrConical2Gradient, (ctx, shader, matrix, tm)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
     }
 
     virtual ~GrConical2Gradient() { }
diff --git a/src/effects/gradients/SkTwoPointRadialGradient.cpp b/src/effects/gradients/SkTwoPointRadialGradient.cpp
index bfc067f543..0f79a2bec6 100644
--- a/src/effects/gradients/SkTwoPointRadialGradient.cpp
+++ b/src/effects/gradients/SkTwoPointRadialGradient.cpp
@@ -433,7 +433,7 @@ public:
                                const SkMatrix& matrix,
                                SkShader::TileMode tm) {
         SkAutoTUnref<GrEffect> effect(SkNEW_ARGS(GrRadial2Gradient, (ctx, shader, matrix, tm)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
     }
 
     virtual ~GrRadial2Gradient() { }
diff --git a/src/gpu/GrEffect.cpp b/src/gpu/GrEffect.cpp
index 6db44f4c52..d1ef4b78cb 100644
--- a/src/gpu/GrEffect.cpp
+++ b/src/gpu/GrEffect.cpp
@@ -64,7 +64,7 @@ SK_DEFINE_INST_COUNT(GrEffectRef)
 
 GrEffectRef::~GrEffectRef() {
     GrAssert(1 == this->getRefCnt());
-    fEffect->effectPtrDestroyed();
+    fEffect->EffectRefDestroyed();
     fEffect->unref();
 }
 
@@ -79,7 +79,7 @@ void GrEffectRef::operator delete(void* target) {
 ///////////////////////////////////////////////////////////////////////////////
 
 GrEffect::~GrEffect() {
-    GrAssert(NULL == fEffectPtr);
+    GrAssert(NULL == fEffectRef);
 }
 
 const char* GrEffect::name() const {
diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp
index a547c1a2da..5e99dad601 100644
--- a/src/gpu/effects/GrConfigConversionEffect.cpp
+++ b/src/gpu/effects/GrConfigConversionEffect.cpp
@@ -139,7 +139,7 @@ GrEffectRef* GrConfigConversionEffect::TestCreate(SkRandom* random,
                                               swapRB,
                                               pmConv,
                                               GrEffectUnitTest::TestMatrix(random))));
-    return CreateEffectPtr(effect);
+    return CreateEffectRef(effect);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -219,9 +219,9 @@ void GrConfigConversionEffect::TestForPreservingPMConversions(GrContext* context
                                                                               *pmToUPMRule,
                                                                               SkMatrix::I())));
 
-        SkAutoTUnref<GrEffectRef> pmToUPMEffect1(CreateEffectPtr(pmToUPM1));
-        SkAutoTUnref<GrEffectRef> upmToPMEffect(CreateEffectPtr(upmToPM));
-        SkAutoTUnref<GrEffectRef> pmToUPMEffect2(CreateEffectPtr(pmToUPM2));
+        SkAutoTUnref<GrEffectRef> pmToUPMEffect1(CreateEffectRef(pmToUPM1));
+        SkAutoTUnref<GrEffectRef> upmToPMEffect(CreateEffectRef(upmToPM));
+        SkAutoTUnref<GrEffectRef> pmToUPMEffect2(CreateEffectRef(pmToUPM2));
 
         context->setRenderTarget(readTex->asRenderTarget());
         paint.colorStage(0)->setEffect(pmToUPMEffect1);
@@ -276,7 +276,7 @@ bool GrConfigConversionEffect::InstallEffect(GrTexture* texture,
                                                                             swapRedAndBlue,
                                                                             pmConversion,
                                                                             matrix)));
-        stage->setEffect(CreateEffectPtr(effect))->unref();
+        stage->setEffect(CreateEffectRef(effect))->unref();
         return true;
     }
 }
diff --git a/src/gpu/effects/GrConvolutionEffect.h b/src/gpu/effects/GrConvolutionEffect.h
index ff661b2adb..4f0c9eca93 100644
--- a/src/gpu/effects/GrConvolutionEffect.h
+++ b/src/gpu/effects/GrConvolutionEffect.h
@@ -27,7 +27,7 @@ public:
                                                                        dir,
                                                                        halfWidth,
                                                                        kernel)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
     }
 
     /// Convolve with a Gaussian kernel
@@ -39,7 +39,7 @@ public:
                                                                        dir,
                                                                        halfWidth,
                                                                        gaussianSigma)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
     }
 
     virtual ~GrConvolutionEffect();
diff --git a/src/gpu/effects/GrSingleTextureEffect.h b/src/gpu/effects/GrSingleTextureEffect.h
index fad2c21239..e475cb5751 100644
--- a/src/gpu/effects/GrSingleTextureEffect.h
+++ b/src/gpu/effects/GrSingleTextureEffect.h
@@ -23,18 +23,18 @@ public:
     /* unfiltered, clamp mode */
     static GrEffectRef* Create(GrTexture* tex, const SkMatrix& matrix) {
         SkAutoTUnref<GrEffect> effect(SkNEW_ARGS(GrSingleTextureEffect, (tex, matrix)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
     }
 
     /* clamp mode */
     static GrEffectRef* Create(GrTexture* tex, const SkMatrix& matrix, bool bilerp) {
         SkAutoTUnref<GrEffect> effect(SkNEW_ARGS(GrSingleTextureEffect, (tex, matrix, bilerp)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
     }
 
     static GrEffectRef* Create(GrTexture* tex, const SkMatrix& matrix, const GrTextureParams& p) {
         SkAutoTUnref<GrEffect> effect(SkNEW_ARGS(GrSingleTextureEffect, (tex, matrix, p)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
     }
 
     virtual ~GrSingleTextureEffect();
diff --git a/src/gpu/effects/GrTextureDomainEffect.cpp b/src/gpu/effects/GrTextureDomainEffect.cpp
index 74727a05c5..f82c62f3ff 100644
--- a/src/gpu/effects/GrTextureDomainEffect.cpp
+++ b/src/gpu/effects/GrTextureDomainEffect.cpp
@@ -148,7 +148,7 @@ GrEffectRef* GrTextureDomainEffect::Create(GrTexture* texture,
                                                                          clippedDomain,
                                                                          wrapMode,
                                                                          bilerp)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
 
     }
 }