Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(333)

Unified Diff: src/gpu/gl/GrGLRenderTarget.h

Issue 1037793002: C++11 override should now be supported by all of {bots,Chrome,Android,Mozilla} (Closed) Base URL: https://skia.googlesource.com/skia@master
Patch Set: git cl web Created 5 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/gpu/gl/GrGLProgram.h ('k') | src/gpu/gl/GrGLStencilBuffer.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/gl/GrGLRenderTarget.h
diff --git a/src/gpu/gl/GrGLRenderTarget.h b/src/gpu/gl/GrGLRenderTarget.h
index 7e7349257f054ac44e8a32cd5626c1cf94e1041c..4d3061c4e487a29c1a4500805d3f7ddef360ee9a 100644
--- a/src/gpu/gl/GrGLRenderTarget.h
+++ b/src/gpu/gl/GrGLRenderTarget.h
@@ -42,7 +42,7 @@ public:
GrGLuint textureFBOID() const { return fTexFBOID; }
// override of GrRenderTarget
- ResolveType getResolveType() const SK_OVERRIDE {
+ ResolveType getResolveType() const override {
if (!this->isMultisampled() ||
fRTFBOID == fTexFBOID) {
// catches FBO 0 and non MSAA case
@@ -55,7 +55,7 @@ public:
}
/** When we don't own the FBO ID we don't attempt to modify its attachments. */
- bool canAttemptStencilAttachment() const SK_OVERRIDE { return !fIsWrapped; }
+ bool canAttemptStencilAttachment() const override { return !fIsWrapped; }
protected:
// The public constructor registers this object with the cache. However, only the most derived
@@ -66,11 +66,11 @@ protected:
void init(const GrSurfaceDesc&, const IDDesc&);
- void onAbandon() SK_OVERRIDE;
- void onRelease() SK_OVERRIDE;
+ void onAbandon() override;
+ void onRelease() override;
// In protected because subclass GrGLTextureRenderTarget calls this version.
- size_t onGpuMemorySize() const SK_OVERRIDE;
+ size_t onGpuMemorySize() const override;
private:
GrGLuint fRTFBOID;
« no previous file with comments | « src/gpu/gl/GrGLProgram.h ('k') | src/gpu/gl/GrGLStencilBuffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698