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

Side by Side Diff: src/gpu/gl/GrGLVertexArray.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/GrGLTextureRenderTarget.h ('k') | src/gpu/gl/GrGLVertexBuffer.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 2013 Google Inc. 2 * Copyright 2013 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 #ifndef GrGLVertexArray_DEFINED 8 #ifndef GrGLVertexArray_DEFINED
9 #define GrGLVertexArray_DEFINED 9 #define GrGLVertexArray_DEFINED
10 10
(...skipping 144 matching lines...) Expand 10 before | Expand all | Expand 10 after
155 155
156 void notifyVertexBufferDelete(GrGLuint id) { 156 void notifyVertexBufferDelete(GrGLuint id) {
157 fAttribArrays.notifyVertexBufferDelete(id); 157 fAttribArrays.notifyVertexBufferDelete(id);
158 } 158 }
159 159
160 GrGLuint arrayID() const { return fID; } 160 GrGLuint arrayID() const { return fID; }
161 161
162 void invalidateCachedState(); 162 void invalidateCachedState();
163 163
164 protected: 164 protected:
165 size_t onGpuMemorySize() const SK_OVERRIDE { return 0; } 165 size_t onGpuMemorySize() const override { return 0; }
166 166
167 void onAbandon() SK_OVERRIDE; 167 void onAbandon() override;
168 168
169 void onRelease() SK_OVERRIDE; 169 void onRelease() override;
170 170
171 private: 171 private:
172 GrGLuint fID; 172 GrGLuint fID;
173 GrGLAttribArrayState fAttribArrays; 173 GrGLAttribArrayState fAttribArrays;
174 GrGLuint fIndexBufferID; 174 GrGLuint fIndexBufferID;
175 bool fIndexBufferIDIsValid; 175 bool fIndexBufferIDIsValid;
176 176
177 typedef GrGpuResource INHERITED; 177 typedef GrGpuResource INHERITED;
178 }; 178 };
179 179
180 #endif 180 #endif
OLDNEW
« no previous file with comments | « src/gpu/gl/GrGLTextureRenderTarget.h ('k') | src/gpu/gl/GrGLVertexBuffer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698