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

Unified Diff: src/gpu/GrFlushToGpuDrawTarget.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/GrDrawTarget.h ('k') | src/gpu/GrGeometryProcessor.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrFlushToGpuDrawTarget.h
diff --git a/src/gpu/GrFlushToGpuDrawTarget.h b/src/gpu/GrFlushToGpuDrawTarget.h
index 4c72f93572d1054721b85cb1ee796ed80b10fab1..fa0ff4aa9cb2096125560382a87bb334d1a939dc 100644
--- a/src/gpu/GrFlushToGpuDrawTarget.h
+++ b/src/gpu/GrFlushToGpuDrawTarget.h
@@ -24,7 +24,7 @@ class GrFlushToGpuDrawTarget : public GrClipTarget {
public:
GrFlushToGpuDrawTarget(GrGpu*, GrVertexBufferAllocPool*,GrIndexBufferAllocPool*);
- ~GrFlushToGpuDrawTarget() SK_OVERRIDE;
+ ~GrFlushToGpuDrawTarget() override;
/**
* Empties the draw buffer of any queued up draws. This must not be called while inside an
@@ -40,7 +40,7 @@ public:
*/
void flush();
- bool geometryHints(size_t vertexStride, int* vertexCount, int* indexCount) const SK_OVERRIDE;
+ bool geometryHints(size_t vertexStride, int* vertexCount, int* indexCount) const override;
protected:
GrGpu* getGpu() { return fGpu; }
@@ -71,25 +71,25 @@ protected:
void willReserveVertexAndIndexSpace(int vertexCount,
size_t vertexStride,
- int indexCount) SK_OVERRIDE;
+ int indexCount) override;
private:
virtual void onReset() = 0;
virtual void onFlush() = 0;
- void setDrawBuffers(DrawInfo*, size_t stride) SK_OVERRIDE;
- bool onReserveVertexSpace(size_t vertexSize, int vertexCount, void** vertices) SK_OVERRIDE;
- bool onReserveIndexSpace(int indexCount, void** indices) SK_OVERRIDE;
- void releaseReservedVertexSpace() SK_OVERRIDE;
- void releaseReservedIndexSpace() SK_OVERRIDE;
- void geometrySourceWillPush() SK_OVERRIDE;
- void geometrySourceWillPop(const GeometrySrcState& restoredState) SK_OVERRIDE;
+ void setDrawBuffers(DrawInfo*, size_t stride) override;
+ bool onReserveVertexSpace(size_t vertexSize, int vertexCount, void** vertices) override;
+ bool onReserveIndexSpace(int indexCount, void** indices) override;
+ void releaseReservedVertexSpace() override;
+ void releaseReservedIndexSpace() override;
+ void geometrySourceWillPush() override;
+ void geometrySourceWillPop(const GeometrySrcState& restoredState) override;
bool onCanCopySurface(const GrSurface* dst,
const GrSurface* src,
const SkIRect& srcRect,
- const SkIPoint& dstPoint) SK_OVERRIDE;
- bool onInitCopySurfaceDstDesc(const GrSurface* src, GrSurfaceDesc* desc) SK_OVERRIDE;
+ const SkIPoint& dstPoint) override;
+ bool onInitCopySurfaceDstDesc(const GrSurface* src, GrSurfaceDesc* desc) override;
GeoPoolStateStack fGeoPoolStateStack;
SkAutoTUnref<GrGpu> fGpu;
« no previous file with comments | « src/gpu/GrDrawTarget.h ('k') | src/gpu/GrGeometryProcessor.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698