diff options
author | 2015-08-27 07:41:13 -0700 | |
---|---|---|
committer | 2015-08-27 07:41:16 -0700 | |
commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /src/gpu/gl/debug/GrDebugGL.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/gl/debug/GrDebugGL.cpp')
-rw-r--r-- | src/gpu/gl/debug/GrDebugGL.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/src/gpu/gl/debug/GrDebugGL.cpp b/src/gpu/gl/debug/GrDebugGL.cpp index ad06862bd7..2de349bc38 100644 --- a/src/gpu/gl/debug/GrDebugGL.cpp +++ b/src/gpu/gl/debug/GrDebugGL.cpp @@ -16,7 +16,7 @@ #include "GrTextureUnitObj.h" #include "GrVertexArrayObj.h" -GrDebugGL* GrDebugGL::gObj = NULL; +GrDebugGL* GrDebugGL::gObj = nullptr; int GrDebugGL::gStaticRefCount = 0; GrDebugGL::Create GrDebugGL::gFactoryFunc[kObjTypeCount] = { GrTextureObj::createGrTextureObj, @@ -34,13 +34,13 @@ GrDebugGL::GrDebugGL() : fPackRowLength(0) , fUnPackRowLength(0) , fCurTextureUnit(0) - , fArrayBuffer(NULL) - , fElementArrayBuffer(NULL) - , fFrameBuffer(NULL) - , fRenderBuffer(NULL) - , fProgram(NULL) - , fTexture(NULL) - , fVertexArray(NULL) + , fArrayBuffer(nullptr) + , fElementArrayBuffer(nullptr) + , fFrameBuffer(nullptr) + , fRenderBuffer(nullptr) + , fProgram(nullptr) + , fTexture(nullptr) + , fVertexArray(nullptr) , fAbandoned(false) { for (int i = 0; i < kDefaultMaxTextureUnits; ++i) { @@ -67,13 +67,13 @@ GrDebugGL::~GrDebugGL() { } fObjects.reset(); - fArrayBuffer = NULL; - fElementArrayBuffer = NULL; - fFrameBuffer = NULL; - fRenderBuffer = NULL; - fProgram = NULL; - fTexture = NULL; - fVertexArray = NULL; + fArrayBuffer = nullptr; + fElementArrayBuffer = nullptr; + fFrameBuffer = nullptr; + fRenderBuffer = nullptr; + fProgram = nullptr; + fTexture = nullptr; + fVertexArray = nullptr; } GrFakeRefObj *GrDebugGL::findObject(GrGLuint ID, GrObjTypes type) { @@ -87,7 +87,7 @@ GrFakeRefObj *GrDebugGL::findObject(GrGLuint ID, GrObjTypes type) { } } - return NULL; + return nullptr; } void GrDebugGL::setArrayBuffer(GrBufferObj *arrayBuffer) { |