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

Side by Side Diff: src/gpu/gl/GrGLTextureRenderTarget.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 unified diff | Download patch
« no previous file with comments | « src/gpu/gl/GrGLTexture.h ('k') | src/gpu/gl/GrGLVertexArray.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright 2014 Google Inc. 2 * Copyright 2014 Google Inc.
3 * 3 *
4 * Use of this source code is governed by a BSD-style license that can be 4 * Use of this source code is governed by a BSD-style license that can be
5 * found in the LICENSE file. 5 * found in the LICENSE file.
6 */ 6 */
7 7
8 8
9 #ifndef GrGLTextureRenderTarget_DEFINED 9 #ifndef GrGLTextureRenderTarget_DEFINED
10 #define GrGLTextureRenderTarget_DEFINED 10 #define GrGLTextureRenderTarget_DEFINED
(...skipping 17 matching lines...) Expand all
28 const GrSurfaceDesc& desc, 28 const GrSurfaceDesc& desc,
29 const GrGLTexture::IDDesc& texIDDesc, 29 const GrGLTexture::IDDesc& texIDDesc,
30 const GrGLRenderTarget::IDDesc& rtIDDesc) 30 const GrGLRenderTarget::IDDesc& rtIDDesc)
31 : GrSurface(gpu, texIDDesc.fLifeCycle, desc) 31 : GrSurface(gpu, texIDDesc.fLifeCycle, desc)
32 , GrGLTexture(gpu, desc, texIDDesc, GrGLTexture::kDerived) 32 , GrGLTexture(gpu, desc, texIDDesc, GrGLTexture::kDerived)
33 , GrGLRenderTarget(gpu, desc, rtIDDesc, GrGLRenderTarget::kDerived) { 33 , GrGLRenderTarget(gpu, desc, rtIDDesc, GrGLRenderTarget::kDerived) {
34 this->registerWithCache(); 34 this->registerWithCache();
35 } 35 }
36 36
37 protected: 37 protected:
38 void onAbandon() SK_OVERRIDE { 38 void onAbandon() override {
39 GrGLRenderTarget::onAbandon(); 39 GrGLRenderTarget::onAbandon();
40 GrGLTexture::onAbandon(); 40 GrGLTexture::onAbandon();
41 } 41 }
42 42
43 void onRelease() SK_OVERRIDE { 43 void onRelease() override {
44 GrGLRenderTarget::onRelease(); 44 GrGLRenderTarget::onRelease();
45 GrGLTexture::onRelease(); 45 GrGLTexture::onRelease();
46 } 46 }
47 47
48 private: 48 private:
49 // GrGLRenderTarget accounts for the texture's memory and any MSAA renderbuf fer's memory. 49 // GrGLRenderTarget accounts for the texture's memory and any MSAA renderbuf fer's memory.
50 size_t onGpuMemorySize() const SK_OVERRIDE { 50 size_t onGpuMemorySize() const override {
51 return GrGLRenderTarget::onGpuMemorySize(); 51 return GrGLRenderTarget::onGpuMemorySize();
52 } 52 }
53 53
54 }; 54 };
55 55
56 #ifdef SK_BUILD_FOR_WIN 56 #ifdef SK_BUILD_FOR_WIN
57 #pragma warning(pop) 57 #pragma warning(pop)
58 #endif 58 #endif
59 59
60 #endif 60 #endif
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLTexture.h ('k') | src/gpu/gl/GrGLVertexArray.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698