diff options
author | mtklein <mtklein@chromium.org> | 2015-01-09 10:06:39 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-09 10:06:40 -0800 |
commit | 72c9faab45124e08c85f70ca38536914862d947c (patch) | |
tree | 611893b84bb33b1592d058ee0f2382f7f86601b8 /src/effects/SkColorCubeFilter.cpp | |
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/effects/SkColorCubeFilter.cpp')
-rw-r--r-- | src/effects/SkColorCubeFilter.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/effects/SkColorCubeFilter.cpp b/src/effects/SkColorCubeFilter.cpp index 9e2b08c91c..78f8ba3ab7 100644 --- a/src/effects/SkColorCubeFilter.cpp +++ b/src/effects/SkColorCubeFilter.cpp @@ -192,16 +192,16 @@ public: virtual ~GrColorCubeEffect(); - virtual const char* name() const SK_OVERRIDE { return "ColorCube"; } + const char* name() const SK_OVERRIDE { return "ColorCube"; } virtual void getGLProcessorKey(const GrGLCaps& caps, GrProcessorKeyBuilder* b) const SK_OVERRIDE; - virtual GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; + GrGLFragmentProcessor* createGLInstance() const SK_OVERRIDE; int colorCubeSize() const { return fColorCubeAccess.getTexture()->width(); } - virtual void onComputeInvariantOutput(GrInvariantOutput*) const SK_OVERRIDE; + void onComputeInvariantOutput(GrInvariantOutput*) const SK_OVERRIDE; class GLProcessor : public GrGLFragmentProcessor { public: @@ -217,7 +217,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: GrGLProgramDataManager::UniformHandle fColorCubeSizeUni; @@ -227,7 +227,7 @@ public: }; private: - virtual bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE { return true; } + bool onIsEqual(const GrFragmentProcessor&) const SK_OVERRIDE { return true; } GrColorCubeEffect(GrTexture* colorCube); |