diff options
author | 2015-03-25 18:17:31 -0700 | |
---|---|---|
committer | 2015-03-25 18:17:32 -0700 | |
commit | 36352bf5e38f45a70ee4f4fc132a38048d38206d (patch) | |
tree | 24f662dbc4bceca8f2e59521ab41ad2c1cf89ca6 /src/gpu/gl/debug | |
parent | 02fd592c8d190058652bb715fb34feb7a72992e5 (diff) |
C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla}
NOPRESUBMIT=true
BUG=skia:
DOCS_PREVIEW= https://skia.org/?cl=1037793002
Review URL: https://codereview.chromium.org/1037793002
Diffstat (limited to 'src/gpu/gl/debug')
-rw-r--r-- | src/gpu/gl/debug/GrBufferObj.h | 2 | ||||
-rw-r--r-- | src/gpu/gl/debug/GrFrameBufferObj.h | 2 | ||||
-rw-r--r-- | src/gpu/gl/debug/GrGLCreateDebugInterface.cpp | 2 | ||||
-rw-r--r-- | src/gpu/gl/debug/GrProgramObj.h | 2 | ||||
-rw-r--r-- | src/gpu/gl/debug/GrRenderBufferObj.h | 2 | ||||
-rw-r--r-- | src/gpu/gl/debug/GrShaderObj.h | 2 | ||||
-rw-r--r-- | src/gpu/gl/debug/GrTextureObj.h | 2 | ||||
-rw-r--r-- | src/gpu/gl/debug/SkDebugGLContext.h | 6 |
8 files changed, 10 insertions, 10 deletions
diff --git a/src/gpu/gl/debug/GrBufferObj.h b/src/gpu/gl/debug/GrBufferObj.h index d0bb83d62c..3c7a30b6d3 100644 --- a/src/gpu/gl/debug/GrBufferObj.h +++ b/src/gpu/gl/debug/GrBufferObj.h @@ -55,7 +55,7 @@ public: void setUsage(GrGLint usage) { fUsage = usage; } GrGLint getUsage() const { return fUsage; } - void deleteAction() SK_OVERRIDE; + void deleteAction() override; protected: private: diff --git a/src/gpu/gl/debug/GrFrameBufferObj.h b/src/gpu/gl/debug/GrFrameBufferObj.h index 3cfa23686b..794450c136 100644 --- a/src/gpu/gl/debug/GrFrameBufferObj.h +++ b/src/gpu/gl/debug/GrFrameBufferObj.h @@ -46,7 +46,7 @@ public: void setStencil(GrFBBindableObj *buffer); GrFBBindableObj *getStencil() { return fStencilBuffer; } - void deleteAction() SK_OVERRIDE { + void deleteAction() override { setColor(NULL); setDepth(NULL); diff --git a/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp b/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp index 77a1422af1..4c2acc3fc4 100644 --- a/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp +++ b/src/gpu/gl/debug/GrGLCreateDebugInterface.cpp @@ -796,7 +796,7 @@ public: fWrapped.reset(interface); } - void abandon() const SK_OVERRIDE { + void abandon() const override { GrDebugGL::abandon(); } diff --git a/src/gpu/gl/debug/GrProgramObj.h b/src/gpu/gl/debug/GrProgramObj.h index d06e410463..a25341a215 100644 --- a/src/gpu/gl/debug/GrProgramObj.h +++ b/src/gpu/gl/debug/GrProgramObj.h @@ -24,7 +24,7 @@ public: void AttachShader(GrShaderObj *shader); - void deleteAction() SK_OVERRIDE; + void deleteAction() override; // TODO: this flag system won't work w/ multiple contexts! void setInUse() { fInUse = true; } diff --git a/src/gpu/gl/debug/GrRenderBufferObj.h b/src/gpu/gl/debug/GrRenderBufferObj.h index 2ad3e2cbde..8231ef58df 100644 --- a/src/gpu/gl/debug/GrRenderBufferObj.h +++ b/src/gpu/gl/debug/GrRenderBufferObj.h @@ -25,7 +25,7 @@ public: void resetBound() { fBound = false; } bool getBound() const { return fBound; } - void deleteAction() SK_OVERRIDE { + void deleteAction() override { this->INHERITED::deleteAction(); } diff --git a/src/gpu/gl/debug/GrShaderObj.h b/src/gpu/gl/debug/GrShaderObj.h index c59d9c9453..977920fe0f 100644 --- a/src/gpu/gl/debug/GrShaderObj.h +++ b/src/gpu/gl/debug/GrShaderObj.h @@ -24,7 +24,7 @@ public: void setType(GrGLenum type) { fType = type; } GrGLenum getType() { return fType; } - void deleteAction() SK_OVERRIDE; + void deleteAction() override; protected: private: diff --git a/src/gpu/gl/debug/GrTextureObj.h b/src/gpu/gl/debug/GrTextureObj.h index 653e23fdbc..fcf851db86 100644 --- a/src/gpu/gl/debug/GrTextureObj.h +++ b/src/gpu/gl/debug/GrTextureObj.h @@ -43,7 +43,7 @@ public: return 0 != fTextureUnitReferees.count(); } - void deleteAction() SK_OVERRIDE; + void deleteAction() override; protected: diff --git a/src/gpu/gl/debug/SkDebugGLContext.h b/src/gpu/gl/debug/SkDebugGLContext.h index 35e4456c86..577953223a 100644 --- a/src/gpu/gl/debug/SkDebugGLContext.h +++ b/src/gpu/gl/debug/SkDebugGLContext.h @@ -12,9 +12,9 @@ class SkDebugGLContext : public SkGLContext { public: - ~SkDebugGLContext() SK_OVERRIDE; - void makeCurrent() const SK_OVERRIDE {} - void swapBuffers() const SK_OVERRIDE {} + ~SkDebugGLContext() override; + void makeCurrent() const override {} + void swapBuffers() const override {} static SkDebugGLContext* Create(GrGLStandard forcedGpuAPI) { if (kGLES_GrGLStandard == forcedGpuAPI) { |