commit a1ebbe447d5eab098111eb83580e55f2f5f6faca
author bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jan 16 15:51:47 2013 +0000
committer bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Jan 16 15:51:47 2013 +0000
tree 87613d55e9e80f47a65ef09b033b5665ea4a1b1d
parent 87c472653be9be8909c9ea0a86a509e90c0cb469

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

src/gpu/GrEffect.cpp

diff --git a/src/gpu/GrEffect.cpp b/src/gpu/GrEffect.cpp
index 6db44f4..d1ef4b7 100644
--- a/src/gpu/GrEffect.cpp
+++ b/src/gpu/GrEffect.cpp
@@ -64,7 +64,7 @@
 
 GrEffectRef::~GrEffectRef() {
     GrAssert(1 == this->getRefCnt());
-    fEffect->effectPtrDestroyed();
+    fEffect->EffectRefDestroyed();
     fEffect->unref();
 }
 
@@ -79,7 +79,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 GrEffect::~GrEffect() {
-    GrAssert(NULL == fEffectPtr);
+    GrAssert(NULL == fEffectRef);
 }
 
 const char* GrEffect::name() const {

src/gpu/effects/GrConfigConversionEffect.cpp

diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp
index a547c1a..5e99dad 100644
--- a/src/gpu/effects/GrConfigConversionEffect.cpp
+++ b/src/gpu/effects/GrConfigConversionEffect.cpp
@@ -139,7 +139,7 @@
                                               swapRB,
                                               pmConv,
                                               GrEffectUnitTest::TestMatrix(random))));
-    return CreateEffectPtr(effect);
+    return CreateEffectRef(effect);
 }
 
 ///////////////////////////////////////////////////////////////////////////////
@@ -219,9 +219,9 @@
                                                                               *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 @@
                                                                             swapRedAndBlue,
                                                                             pmConversion,
                                                                             matrix)));
-        stage->setEffect(CreateEffectPtr(effect))->unref();
+        stage->setEffect(CreateEffectRef(effect))->unref();
         return true;
     }
 }

src/gpu/effects/GrConvolutionEffect.h

diff --git a/src/gpu/effects/GrConvolutionEffect.h b/src/gpu/effects/GrConvolutionEffect.h
index ff661b2..4f0c9ec 100644
--- a/src/gpu/effects/GrConvolutionEffect.h
+++ b/src/gpu/effects/GrConvolutionEffect.h
@@ -27,7 +27,7 @@
                                                                        dir,
                                                                        halfWidth,
                                                                        kernel)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
     }
 
     /// Convolve with a Gaussian kernel
@@ -39,7 +39,7 @@
                                                                        dir,
                                                                        halfWidth,
                                                                        gaussianSigma)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
     }
 
     virtual ~GrConvolutionEffect();

src/gpu/effects/GrSingleTextureEffect.h

diff --git a/src/gpu/effects/GrSingleTextureEffect.h b/src/gpu/effects/GrSingleTextureEffect.h
index fad2c21..e475cb5 100644
--- a/src/gpu/effects/GrSingleTextureEffect.h
+++ b/src/gpu/effects/GrSingleTextureEffect.h
@@ -23,18 +23,18 @@
     /* 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();

src/gpu/effects/GrTextureDomainEffect.cpp

diff --git a/src/gpu/effects/GrTextureDomainEffect.cpp b/src/gpu/effects/GrTextureDomainEffect.cpp
index 74727a0..f82c62f 100644
--- a/src/gpu/effects/GrTextureDomainEffect.cpp
+++ b/src/gpu/effects/GrTextureDomainEffect.cpp
@@ -148,7 +148,7 @@
                                                                          clippedDomain,
                                                                          wrapMode,
                                                                          bilerp)));
-        return CreateEffectPtr(effect);
+        return CreateEffectRef(effect);
 
     }
 }