diff options
| author |  bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-17 16:50:08 +0000 |
|---|---|---|
| committer | bsalomon@google.com <bsalomon@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2013-01-17 16:50:08 +0000 |
| commit | 68b58c95384dd6c2fd389a5b4bbf8fc468819454 (patch) | |
| tree | 53cf3d959de9fa42a6b064d05580203c1b84065b /src/effects/SkTableColorFilter.cpp | |
| parent | e8cc6e8071935339a06548b13a0668b56a7540f5 (diff) | |
Remove default implementation of GrEffect::isEqual. Make GrSingleTextureEffect abstract.
Review URL: https://codereview.appspot.com/7142049
git-svn-id: http://skia.googlecode.com/svn/trunk@7254 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/effects/SkTableColorFilter.cpp')
| -rw-r--r-- | src/effects/SkTableColorFilter.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index 0a922e712a..afb4a9926c 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -235,13 +235,14 @@ public: static const char* Name() { return "ColorTable"; } virtual const GrBackendEffectFactory& getFactory() const SK_OVERRIDE; - virtual bool isEqual(const GrEffect&) const SK_OVERRIDE; virtual void getConstantColorComponents(GrColor* color, uint32_t* validFlags) const SK_OVERRIDE; typedef GLColorTableEffect GLEffect; private: + virtual bool onIsEqual(const GrEffect&) const SK_OVERRIDE; + explicit ColorTableEffect(GrTexture* texture, unsigned flags); GR_DECLARE_EFFECT_TEST; @@ -344,8 +345,8 @@ const GrBackendEffectFactory& ColorTableEffect::getFactory() const { return GrTBackendEffectFactory<ColorTableEffect>::getInstance(); } -bool ColorTableEffect::isEqual(const GrEffect& sBase) const { - return INHERITED::isEqual(sBase); +bool ColorTableEffect::onIsEqual(const GrEffect& sBase) const { + return this->texture(0) == sBase.texture(0); } void ColorTableEffect::getConstantColorComponents(GrColor* color, uint32_t* validFlags) const { |