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/gpu/gl/GrGLTexture.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/gl/GrGLTexture.h')
-rw-r--r-- | src/gpu/gl/GrGLTexture.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gpu/gl/GrGLTexture.h b/src/gpu/gl/GrGLTexture.h index 7c64e17b9d..cc8adeb7ce 100644 --- a/src/gpu/gl/GrGLTexture.h +++ b/src/gpu/gl/GrGLTexture.h @@ -33,9 +33,9 @@ public: GrGLTexture(GrGLGpu*, const GrSurfaceDesc&, const IDDesc&); - virtual GrBackendObject getTextureHandle() const SK_OVERRIDE; + GrBackendObject getTextureHandle() const SK_OVERRIDE; - virtual void textureParamsModified() SK_OVERRIDE { fTexParams.invalidate(); } + void textureParamsModified() SK_OVERRIDE { fTexParams.invalidate(); } // These functions are used to track the texture parameters associated with the texture. const TexParams& getCachedTexParams(GrGpu::ResetTimestamp* timestamp) const { @@ -60,8 +60,8 @@ protected: void init(const GrSurfaceDesc&, const IDDesc&); - virtual void onAbandon() SK_OVERRIDE; - virtual void onRelease() SK_OVERRIDE; + void onAbandon() SK_OVERRIDE; + void onRelease() SK_OVERRIDE; private: TexParams fTexParams; |