diff options
| author |  halcanary <halcanary@google.com> | 2015-08-27 07:41:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-27 07:41:16 -0700 |
| commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
| tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /src/gpu/GrResourceProvider.cpp | |
| parent | 435af2f736c85c3274a0c6760a3523810750d237 (diff) | |
Style Change: NULL->nullptr
DOCS_PREVIEW= https://skia.org/?cl=1316233002
Review URL: https://codereview.chromium.org/1316233002
Diffstat (limited to 'src/gpu/GrResourceProvider.cpp')
| -rw-r--r-- | src/gpu/GrResourceProvider.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/gpu/GrResourceProvider.cpp b/src/gpu/GrResourceProvider.cpp index e328c666a0..d3ab8ccfa1 100644 --- a/src/gpu/GrResourceProvider.cpp +++ b/src/gpu/GrResourceProvider.cpp @@ -32,10 +32,10 @@ const GrIndexBuffer* GrResourceProvider::createInstancedIndexBuffer(const uint16 GrIndexBuffer* buffer = this->createIndexBuffer(bufferSize, kStatic_BufferUsage, kNoPendingIO_Flag); if (!buffer) { - return NULL; + return nullptr; } uint16_t* data = (uint16_t*) buffer->map(); - bool useTempData = (NULL == data); + bool useTempData = (nullptr == data); if (useTempData) { data = new uint16_t[reps * patternSize]; } @@ -49,7 +49,7 @@ const GrIndexBuffer* GrResourceProvider::createInstancedIndexBuffer(const uint16 if (useTempData) { if (!buffer->updateData(data, bufferSize)) { buffer->unref(); - return NULL; + return nullptr; } delete[] data; } else { @@ -88,7 +88,7 @@ GrPathRange* GrResourceProvider::createGlyphs(const SkTypeface* tf, const SkDesc GrIndexBuffer* GrResourceProvider::createIndexBuffer(size_t size, BufferUsage usage, uint32_t flags) { if (this->isAbandoned()) { - return NULL; + return nullptr; } bool noPendingIO = SkToBool(flags & kNoPendingIO_Flag); @@ -117,7 +117,7 @@ GrIndexBuffer* GrResourceProvider::createIndexBuffer(size_t size, BufferUsage us GrVertexBuffer* GrResourceProvider::createVertexBuffer(size_t size, BufferUsage usage, uint32_t flags) { if (this->isAbandoned()) { - return NULL; + return nullptr; } bool noPendingIO = SkToBool(flags & kNoPendingIO_Flag); @@ -159,7 +159,7 @@ GrBatchAtlas* GrResourceProvider::createAtlas(GrPixelConfig config, static const uint32_t kFlags = GrResourceProvider::kNoPendingIO_Flag; GrTexture* texture = this->createApproxTexture(desc, kFlags); if (!texture) { - return NULL; + return nullptr; } return new GrBatchAtlas(texture, numPlotsX, numPlotsY); } |