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/GrTextureProvider.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 4 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/GrTextContext.cpp ('k') | src/gpu/GrVertices.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrTextureProvider.cpp
diff --git a/src/gpu/GrTextureProvider.cpp b/src/gpu/GrTextureProvider.cpp
index 253fe032ed90e9b8cab86824560f0289a5150d7a..26384abbd2ad5bcd93ca65203631035a16d18334 100644
--- a/src/gpu/GrTextureProvider.cpp
+++ b/src/gpu/GrTextureProvider.cpp
@@ -20,11 +20,11 @@ enum ScratchTextureFlags {
GrTexture* GrTextureProvider::createTexture(const GrSurfaceDesc& desc, bool budgeted,
const void* srcData, size_t rowBytes) {
if (this->isAbandoned()) {
- return NULL;
+ return nullptr;
}
if ((desc.fFlags & kRenderTarget_GrSurfaceFlag) &&
!fGpu->caps()->isConfigRenderable(desc.fConfig, desc.fSampleCnt > 0)) {
- return NULL;
+ return nullptr;
}
if (!GrPixelConfigIsCompressed(desc.fConfig)) {
static const uint32_t kFlags = kExact_ScratchTextureFlag |
@@ -50,11 +50,11 @@ GrTexture* GrTextureProvider::createApproxTexture(const GrSurfaceDesc& desc) {
GrTexture* GrTextureProvider::internalCreateApproxTexture(const GrSurfaceDesc& desc,
uint32_t scratchFlags) {
if (this->isAbandoned()) {
- return NULL;
+ return nullptr;
}
// Currently we don't recycle compressed textures as scratch.
if (GrPixelConfigIsCompressed(desc.fConfig)) {
- return NULL;
+ return nullptr;
} else {
return this->refScratchTexture(desc, scratchFlags);
}
@@ -100,22 +100,22 @@ GrTexture* GrTextureProvider::refScratchTexture(const GrSurfaceDesc& inDesc,
}
if (!(kNoCreate_ScratchTextureFlag & flags)) {
- return fGpu->createTexture(*desc, true, NULL, 0);
+ return fGpu->createTexture(*desc, true, nullptr, 0);
}
- return NULL;
+ return nullptr;
}
GrTexture* GrTextureProvider::wrapBackendTexture(const GrBackendTextureDesc& desc,
GrWrapOwnership ownership) {
if (this->isAbandoned()) {
- return NULL;
+ return nullptr;
}
return fGpu->wrapBackendTexture(desc, ownership);
}
GrRenderTarget* GrTextureProvider::wrapBackendRenderTarget(const GrBackendRenderTargetDesc& desc) {
- return this->isAbandoned() ? NULL : fGpu->wrapBackendRenderTarget(desc,
+ return this->isAbandoned() ? nullptr : fGpu->wrapBackendRenderTarget(desc,
kBorrow_GrWrapOwnership);
}
@@ -131,5 +131,5 @@ bool GrTextureProvider::existsResourceWithUniqueKey(const GrUniqueKey& key) cons
}
GrGpuResource* GrTextureProvider::findAndRefResourceByUniqueKey(const GrUniqueKey& key) {
- return this->isAbandoned() ? NULL : fCache->findAndRefUniqueResource(key);
+ return this->isAbandoned() ? nullptr : fCache->findAndRefUniqueResource(key);
}
« no previous file with comments | « src/gpu/GrTextContext.cpp ('k') | src/gpu/GrVertices.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698