| Index: src/effects/SkDisplacementMapEffect.cpp
|
| diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
|
| index d18d3c3b6a4e68f6c3f86dd577feee46e416f4fb..263ac8c69c601b4d83cfe44f577b6aff9357d0c7 100644
|
| --- a/src/effects/SkDisplacementMapEffect.cpp
|
| +++ b/src/effects/SkDisplacementMapEffect.cpp
|
| @@ -314,7 +314,7 @@ public:
|
|
|
| static inline void GenKey(const GrProcessor&, const GrGLCaps&, GrProcessorKeyBuilder*);
|
|
|
| - virtual void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
|
| + void setData(const GrGLProgramDataManager&, const GrProcessor&) SK_OVERRIDE;
|
|
|
| private:
|
| SkDisplacementMapEffect::ChannelSelectorType fXChannelSelector;
|
| @@ -347,7 +347,7 @@ public:
|
| GrGLDisplacementMapEffect::GenKey(*this, caps, b);
|
| }
|
|
|
| - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE {
|
| + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE {
|
| return SkNEW_ARGS(GrGLDisplacementMapEffect, (*this));
|
| }
|
|
|
| @@ -357,12 +357,12 @@ public:
|
| { return fYChannelSelector; }
|
| const SkVector& scale() const { return fScale; }
|
|
|
| - virtual const char* name() const SK_OVERRIDE { return "DisplacementMap"; }
|
| + const char* name() const SK_OVERRIDE { return "DisplacementMap"; }
|
|
|
| private:
|
| - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE;
|
| + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE;
|
|
|
| - virtual void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE;
|
| + void onComputeInvariantOutput(GrInvariantOutput* inout) const SK_OVERRIDE;
|
|
|
| GrDisplacementMapEffect(SkDisplacementMapEffect::ChannelSelectorType xChannelSelector,
|
| SkDisplacementMapEffect::ChannelSelectorType yChannelSelector,
|
|
|