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

Unified Diff: src/gpu/GrTest.cpp

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/GrTessellatingPathRenderer.cpp ('k') | src/gpu/GrTestBatch.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrTest.cpp
diff --git a/src/gpu/GrTest.cpp b/src/gpu/GrTest.cpp
index cefd015e92964220586c6b01204dab07a97e645a..aca7133215680ca1412076536155f3275707d4fe 100644
--- a/src/gpu/GrTest.cpp
+++ b/src/gpu/GrTest.cpp
@@ -142,8 +142,8 @@ class GrPipeline;
class MockGpu : public GrGpu {
public:
MockGpu(GrContext* context) : INHERITED(context) { fCaps.reset(SkNEW(GrDrawTargetCaps)); }
- ~MockGpu() SK_OVERRIDE {}
- bool canWriteTexturePixels(const GrTexture*, GrPixelConfig srcConfig) const SK_OVERRIDE {
+ ~MockGpu() override {}
+ bool canWriteTexturePixels(const GrTexture*, GrPixelConfig srcConfig) const override {
return true;
}
@@ -151,60 +151,60 @@ public:
int left, int top,
int width, int height,
GrPixelConfig config,
- size_t rowBytes) const SK_OVERRIDE { return false; }
+ size_t rowBytes) const override { return false; }
void buildProgramDesc(GrProgramDesc*,const GrPrimitiveProcessor&,
const GrPipeline&,
- const GrBatchTracker&) const SK_OVERRIDE {}
+ const GrBatchTracker&) const override {}
- void discard(GrRenderTarget*) SK_OVERRIDE {}
+ void discard(GrRenderTarget*) override {}
bool canCopySurface(const GrSurface* dst,
const GrSurface* src,
const SkIRect& srcRect,
- const SkIPoint& dstPoint) SK_OVERRIDE { return false; };
+ const SkIPoint& dstPoint) override { return false; };
bool copySurface(GrSurface* dst,
GrSurface* src,
const SkIRect& srcRect,
- const SkIPoint& dstPoint) SK_OVERRIDE { return false; };
+ const SkIPoint& dstPoint) override { return false; };
- bool initCopySurfaceDstDesc(const GrSurface* src, GrSurfaceDesc* desc) SK_OVERRIDE {
+ bool initCopySurfaceDstDesc(const GrSurface* src, GrSurfaceDesc* desc) override {
return false;
}
private:
- void onResetContext(uint32_t resetBits) SK_OVERRIDE {}
+ void onResetContext(uint32_t resetBits) override {}
GrTexture* onCreateTexture(const GrSurfaceDesc& desc, bool budgeted, const void* srcData,
- size_t rowBytes) SK_OVERRIDE {
+ size_t rowBytes) override {
return NULL;
}
GrTexture* onCreateCompressedTexture(const GrSurfaceDesc& desc, bool budgeted,
- const void* srcData) SK_OVERRIDE {
+ const void* srcData) override {
return NULL;
}
- GrTexture* onWrapBackendTexture(const GrBackendTextureDesc&) SK_OVERRIDE { return NULL; }
+ GrTexture* onWrapBackendTexture(const GrBackendTextureDesc&) override { return NULL; }
- GrRenderTarget* onWrapBackendRenderTarget(const GrBackendRenderTargetDesc&) SK_OVERRIDE {
+ GrRenderTarget* onWrapBackendRenderTarget(const GrBackendRenderTargetDesc&) override {
return NULL;
}
- GrVertexBuffer* onCreateVertexBuffer(size_t size, bool dynamic) SK_OVERRIDE { return NULL; }
+ GrVertexBuffer* onCreateVertexBuffer(size_t size, bool dynamic) override { return NULL; }
- GrIndexBuffer* onCreateIndexBuffer(size_t size, bool dynamic) SK_OVERRIDE { return NULL; }
+ GrIndexBuffer* onCreateIndexBuffer(size_t size, bool dynamic) override { return NULL; }
void onClear(GrRenderTarget*, const SkIRect* rect, GrColor color,
- bool canIgnoreRect) SK_OVERRIDE {}
+ bool canIgnoreRect) override {}
- void onClearStencilClip(GrRenderTarget*, const SkIRect& rect, bool insideClip) SK_OVERRIDE {}
+ void onClearStencilClip(GrRenderTarget*, const SkIRect& rect, bool insideClip) override {}
- void onDraw(const DrawArgs&, const GrDrawTarget::DrawInfo&) SK_OVERRIDE {}
+ void onDraw(const DrawArgs&, const GrDrawTarget::DrawInfo&) override {}
- void onStencilPath(const GrPath* path, const StencilPathState& state) SK_OVERRIDE {}
+ void onStencilPath(const GrPath* path, const StencilPathState& state) override {}
- void onDrawPath(const DrawArgs&, const GrPath*, const GrStencilSettings&) SK_OVERRIDE {}
+ void onDrawPath(const DrawArgs&, const GrPath*, const GrStencilSettings&) override {}
void onDrawPaths(const DrawArgs&,
const GrPathRange*,
@@ -213,38 +213,38 @@ private:
const float transformValues[],
GrDrawTarget::PathTransformType,
int count,
- const GrStencilSettings&) SK_OVERRIDE {}
+ const GrStencilSettings&) override {}
bool onReadPixels(GrRenderTarget* target,
int left, int top, int width, int height,
GrPixelConfig,
void* buffer,
- size_t rowBytes) SK_OVERRIDE {
+ size_t rowBytes) override {
return false;
}
bool onWriteTexturePixels(GrTexture* texture,
int left, int top, int width, int height,
GrPixelConfig config, const void* buffer,
- size_t rowBytes) SK_OVERRIDE {
+ size_t rowBytes) override {
return false;
}
- void onResolveRenderTarget(GrRenderTarget* target) SK_OVERRIDE { return; }
+ void onResolveRenderTarget(GrRenderTarget* target) override { return; }
- bool createStencilBufferForRenderTarget(GrRenderTarget*, int width, int height) SK_OVERRIDE {
+ bool createStencilBufferForRenderTarget(GrRenderTarget*, int width, int height) override {
return false;
}
- bool attachStencilBufferToRenderTarget(GrStencilBuffer*, GrRenderTarget*) SK_OVERRIDE {
+ bool attachStencilBufferToRenderTarget(GrStencilBuffer*, GrRenderTarget*) override {
return false;
}
- void clearStencil(GrRenderTarget* target) SK_OVERRIDE {}
+ void clearStencil(GrRenderTarget* target) override {}
- void didAddGpuTraceMarker() SK_OVERRIDE {}
+ void didAddGpuTraceMarker() override {}
- void didRemoveGpuTraceMarker() SK_OVERRIDE {}
+ void didRemoveGpuTraceMarker() override {}
typedef GrGpu INHERITED;
};
« no previous file with comments | « src/gpu/GrTessellatingPathRenderer.cpp ('k') | src/gpu/GrTestBatch.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698