| Index: src/gpu/effects/GrConfigConversionEffect.h
|
| diff --git a/src/gpu/effects/GrConfigConversionEffect.h b/src/gpu/effects/GrConfigConversionEffect.h
|
| index d85e783c27909003d3739d3a9bc46b85e94c310b..5760bb4c16cac0ee6c2f1ac1181ae0354698a130 100644
|
| --- a/src/gpu/effects/GrConfigConversionEffect.h
|
| +++ b/src/gpu/effects/GrConfigConversionEffect.h
|
| @@ -37,11 +37,11 @@ public:
|
| static const GrFragmentProcessor* Create(GrTexture*, bool swapRedAndBlue, PMConversion,
|
| const SkMatrix&);
|
|
|
| - virtual const char* name() const SK_OVERRIDE { return "Config Conversion"; }
|
| + const char* name() const SK_OVERRIDE { return "Config Conversion"; }
|
|
|
| - virtual void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE;
|
| + void getGLProcessorKey(const GrGLCaps&, GrProcessorKeyBuilder*) const SK_OVERRIDE;
|
|
|
| - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE;
|
| + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE;
|
|
|
| bool swapsRedAndBlue() const { return fSwapRedAndBlue; }
|
| PMConversion pmConversion() const { return fPMConversion; }
|
| @@ -61,9 +61,9 @@ private:
|
| PMConversion pmConversion,
|
| const SkMatrix& matrix);
|
|
|
| - 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;
|
|
|
| bool fSwapRedAndBlue;
|
| PMConversion fPMConversion;
|
|
|