diff options
author | 2013-01-22 20:35:13 +0000 | |
---|---|---|
committer | 2013-01-22 20:35:13 +0000 | |
commit | 8a252f79629b189a03de22cd8ff0312c5bccedd1 (patch) | |
tree | 8c2aa239766105fe6b5079c349b6a302c922c983 /src/gpu | |
parent | 1e3052354ac155e3d9418cf7e8c8e009df524e01 (diff) |
Switch GrEffect::onIsEqual signature back to GrEffect from GrEffectRef.
R=robertphillips@google.com
Review URL: https://codereview.appspot.com/7188046
git-svn-id: http://skia.googlecode.com/svn/trunk@7326 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/gpu')
-rw-r--r-- | src/gpu/effects/GrConfigConversionEffect.cpp | 4 | ||||
-rw-r--r-- | src/gpu/effects/GrConfigConversionEffect.h | 2 | ||||
-rw-r--r-- | src/gpu/effects/GrConvolutionEffect.cpp | 2 | ||||
-rw-r--r-- | src/gpu/effects/GrConvolutionEffect.h | 2 | ||||
-rw-r--r-- | src/gpu/effects/GrSimpleTextureEffect.h | 2 | ||||
-rw-r--r-- | src/gpu/effects/GrTextureDomainEffect.cpp | 2 | ||||
-rw-r--r-- | src/gpu/effects/GrTextureDomainEffect.h | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/src/gpu/effects/GrConfigConversionEffect.cpp b/src/gpu/effects/GrConfigConversionEffect.cpp index 2271b105b5..4c4d0792c0 100644 --- a/src/gpu/effects/GrConfigConversionEffect.cpp +++ b/src/gpu/effects/GrConfigConversionEffect.cpp @@ -115,9 +115,9 @@ const GrBackendEffectFactory& GrConfigConversionEffect::getFactory() const { return GrTBackendEffectFactory<GrConfigConversionEffect>::getInstance(); } -bool GrConfigConversionEffect::onIsEqual(const GrEffectRef& s) const { +bool GrConfigConversionEffect::onIsEqual(const GrEffect& s) const { const GrConfigConversionEffect& other = CastEffect<GrConfigConversionEffect>(s); - return this->texture(0) == s->texture(0) && + return this->texture(0) == s.texture(0) && other.fSwapRedAndBlue == fSwapRedAndBlue && other.fPMConversion == fPMConversion; } diff --git a/src/gpu/effects/GrConfigConversionEffect.h b/src/gpu/effects/GrConfigConversionEffect.h index 08e5f71001..3845d32bbd 100644 --- a/src/gpu/effects/GrConfigConversionEffect.h +++ b/src/gpu/effects/GrConfigConversionEffect.h @@ -66,7 +66,7 @@ private: PMConversion pmConversion, const SkMatrix& matrix); - virtual bool onIsEqual(const GrEffectRef&) const SK_OVERRIDE; + virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE; bool fSwapRedAndBlue; PMConversion fPMConversion; diff --git a/src/gpu/effects/GrConvolutionEffect.cpp b/src/gpu/effects/GrConvolutionEffect.cpp index ffa5427155..896885794d 100644 --- a/src/gpu/effects/GrConvolutionEffect.cpp +++ b/src/gpu/effects/GrConvolutionEffect.cpp @@ -166,7 +166,7 @@ const GrBackendEffectFactory& GrConvolutionEffect::getFactory() const { return GrTBackendEffectFactory<GrConvolutionEffect>::getInstance(); } -bool GrConvolutionEffect::onIsEqual(const GrEffectRef& sBase) const { +bool GrConvolutionEffect::onIsEqual(const GrEffect& sBase) const { const GrConvolutionEffect& s = CastEffect<GrConvolutionEffect>(sBase); return (this->texture(0) == s.texture(0) && this->radius() == s.radius() && diff --git a/src/gpu/effects/GrConvolutionEffect.h b/src/gpu/effects/GrConvolutionEffect.h index 7345ae4fee..072404856e 100644 --- a/src/gpu/effects/GrConvolutionEffect.h +++ b/src/gpu/effects/GrConvolutionEffect.h @@ -82,7 +82,7 @@ private: int halfWidth, float gaussianSigma); - virtual bool onIsEqual(const GrEffectRef&) const SK_OVERRIDE; + virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE; GR_DECLARE_EFFECT_TEST; diff --git a/src/gpu/effects/GrSimpleTextureEffect.h b/src/gpu/effects/GrSimpleTextureEffect.h index b7466b4ffb..ffc05e5b52 100644 --- a/src/gpu/effects/GrSimpleTextureEffect.h +++ b/src/gpu/effects/GrSimpleTextureEffect.h @@ -54,7 +54,7 @@ private: GrSimpleTextureEffect(GrTexture* texture, const SkMatrix& matrix, const GrTextureParams& params) : GrSingleTextureEffect(texture, matrix, params) {} - virtual bool onIsEqual(const GrEffectRef& other) const SK_OVERRIDE { + virtual bool onIsEqual(const GrEffect& other) const SK_OVERRIDE { const GrSimpleTextureEffect& ste = CastEffect<GrSimpleTextureEffect>(other); return this->hasSameTextureParamsAndMatrix(ste); } diff --git a/src/gpu/effects/GrTextureDomainEffect.cpp b/src/gpu/effects/GrTextureDomainEffect.cpp index 58c8b80762..bfd62c2528 100644 --- a/src/gpu/effects/GrTextureDomainEffect.cpp +++ b/src/gpu/effects/GrTextureDomainEffect.cpp @@ -169,7 +169,7 @@ const GrBackendEffectFactory& GrTextureDomainEffect::getFactory() const { return GrTBackendEffectFactory<GrTextureDomainEffect>::getInstance(); } -bool GrTextureDomainEffect::onIsEqual(const GrEffectRef& sBase) const { +bool GrTextureDomainEffect::onIsEqual(const GrEffect& sBase) const { const GrTextureDomainEffect& s = CastEffect<GrTextureDomainEffect>(sBase); return this->hasSameTextureParamsAndMatrix(s) && this->fTextureDomain == s.fTextureDomain; } diff --git a/src/gpu/effects/GrTextureDomainEffect.h b/src/gpu/effects/GrTextureDomainEffect.h index 81b3da4f4b..b7f665cba3 100644 --- a/src/gpu/effects/GrTextureDomainEffect.h +++ b/src/gpu/effects/GrTextureDomainEffect.h @@ -77,7 +77,7 @@ private: WrapMode, bool bilerp); - virtual bool onIsEqual(const GrEffectRef&) const SK_OVERRIDE; + virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE; GR_DECLARE_EFFECT_TEST; |