diff options
author | 2015-01-09 10:06:39 -0800 | |
---|---|---|
committer | 2015-01-09 10:06:40 -0800 | |
commit | 72c9faab45124e08c85f70ca38536914862d947c (patch) | |
tree | 611893b84bb33b1592d058ee0f2382f7f86601b8 /src/gpu/effects/GrMatrixConvolutionEffect.h | |
parent | 4490da227f1475fb66af20532c14d6d9febd18b6 (diff) |
Fix up all the easy virtual ... SK_OVERRIDE cases.
This fixes every case where virtual and SK_OVERRIDE were on the same line,
which should be the bulk of cases. We'll have to manually clean up the rest
over time unless I level up in regexes.
for f in (find . -type f); perl -p -i -e 's/virtual (.*)SK_OVERRIDE/\1SK_OVERRIDE/g' $f; end
BUG=skia:
Review URL: https://codereview.chromium.org/806653007
Diffstat (limited to 'src/gpu/effects/GrMatrixConvolutionEffect.h')
-rw-r--r-- | src/gpu/effects/GrMatrixConvolutionEffect.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/gpu/effects/GrMatrixConvolutionEffect.h b/src/gpu/effects/GrMatrixConvolutionEffect.h index 8d6bb7cc10..8f92175fae 100644 --- a/src/gpu/effects/GrMatrixConvolutionEffect.h +++ b/src/gpu/effects/GrMatrixConvolutionEffect.h @@ -60,11 +60,11 @@ public: bool convolveAlpha() const { return fConvolveAlpha; } const GrTextureDomain& domain() const { return fDomain; } - virtual const char* name() const SK_OVERRIDE { return "MatrixConvolution"; } + const char* name() const SK_OVERRIDE { return "MatrixConvolution"; } - 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; private: GrMatrixConvolutionEffect(GrTexture*, @@ -77,9 +77,9 @@ private: GrTextureDomain::Mode tileMode, bool convolveAlpha); - 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 { // TODO: Try to do better? inout->mulByUnknownFourComponents(); } |