Index: src/gpu/GrTest.cpp |
diff --git a/src/gpu/GrTest.cpp b/src/gpu/GrTest.cpp |
index 1f5e2ce9f6e9e4f285a6d88719d17faa3abd1483..566ae544591686d3133fc98f71c774fa405829f7 100644 |
--- a/src/gpu/GrTest.cpp |
+++ b/src/gpu/GrTest.cpp |
@@ -213,25 +213,25 @@ private: |
GrTexture* onCreateTexture(const GrSurfaceDesc& desc, GrGpuResource::LifeCycle lifeCycle, |
const void* srcData, size_t rowBytes) override { |
- return NULL; |
+ return nullptr; |
} |
GrTexture* onCreateCompressedTexture(const GrSurfaceDesc& desc, GrGpuResource::LifeCycle, |
const void* srcData) override { |
- return NULL; |
+ return nullptr; |
} |
GrTexture* onWrapBackendTexture(const GrBackendTextureDesc&, |
- GrWrapOwnership) override { return NULL; } |
+ GrWrapOwnership) override { return nullptr; } |
GrRenderTarget* onWrapBackendRenderTarget(const GrBackendRenderTargetDesc&, |
GrWrapOwnership) override { |
- return NULL; |
+ return nullptr; |
} |
- GrVertexBuffer* onCreateVertexBuffer(size_t size, bool dynamic) override { return NULL; } |
+ GrVertexBuffer* onCreateVertexBuffer(size_t size, bool dynamic) override { return nullptr; } |
- GrIndexBuffer* onCreateIndexBuffer(size_t size, bool dynamic) override { return NULL; } |
+ GrIndexBuffer* onCreateIndexBuffer(size_t size, bool dynamic) override { return nullptr; } |
void onClear(GrRenderTarget*, const SkIRect& rect, GrColor color) override {} |
@@ -290,7 +290,7 @@ GrContext* GrContext::CreateMockContext() { |
void GrContext::initMockContext() { |
GrContextOptions options; |
options.fGeometryBufferMapThreshold = 0; |
- SkASSERT(NULL == fGpu); |
+ SkASSERT(nullptr == fGpu); |
fGpu = new MockGpu(this, options); |
SkASSERT(fGpu); |
this->initCommon(); |