Index: src/gpu/gl/GrGLPathRendering.cpp |
diff --git a/src/gpu/gl/GrGLPathRendering.cpp b/src/gpu/gl/GrGLPathRendering.cpp |
index 22b12bf9889f42db9cc1dcddfaa4c3066d0ed491..78f78baf9d442611d9dc2f116886db4f65d561bf 100644 |
--- a/src/gpu/gl/GrGLPathRendering.cpp |
+++ b/src/gpu/gl/GrGLPathRendering.cpp |
@@ -63,14 +63,14 @@ GrGLPathRendering::GrGLPathRendering(GrGLGpu* gpu) |
: GrPathRendering(gpu) { |
const GrGLInterface* glInterface = gpu->glInterface(); |
fCaps.bindFragmentInputSupport = |
- NULL != glInterface->fFunctions.fBindFragmentInputLocation; |
+ nullptr != glInterface->fFunctions.fBindFragmentInputLocation; |
} |
GrGLPathRendering::~GrGLPathRendering() { |
} |
void GrGLPathRendering::abandonGpuResources() { |
- fPathNameAllocator.reset(NULL); |
+ fPathNameAllocator.reset(nullptr); |
} |
void GrGLPathRendering::resetContext() { |
@@ -101,7 +101,7 @@ void GrGLPathRendering::onStencilPath(const StencilPathArgs& args, const GrPath* |
this->setProjectionMatrix(*args.fViewMatrix, size, rt->origin()); |
gpu->flushScissor(*args.fScissor, rt->getViewport(), rt->origin()); |
gpu->flushHWAAState(rt, args.fUseHWAA); |
- gpu->flushRenderTarget(rt, NULL); |
+ gpu->flushRenderTarget(rt, nullptr); |
const GrGLPath* glPath = static_cast<const GrGLPath*>(path); |
@@ -236,7 +236,7 @@ GrGLuint GrGLPathRendering::genPaths(GrGLsizei range) { |
return name; |
} |
- if (NULL == fPathNameAllocator.get()) { |
+ if (nullptr == fPathNameAllocator.get()) { |
static const int range = 65536; |
GrGLuint firstName; |
GL_CALL_RET(firstName, GenPaths(range)); |
@@ -259,14 +259,14 @@ void GrGLPathRendering::deletePaths(GrGLuint path, GrGLsizei range) { |
if (range > 1) { |
// It is not supported to delete names in ranges that were allocated |
// individually using GrGLPathNameAllocator. |
- SkASSERT(NULL == fPathNameAllocator.get() || |
+ SkASSERT(nullptr == fPathNameAllocator.get() || |
path + range <= fPathNameAllocator->firstName() || |
path >= fPathNameAllocator->endName()); |
GL_CALL(DeletePaths(path, range)); |
return; |
} |
- if (NULL == fPathNameAllocator.get() || |
+ if (nullptr == fPathNameAllocator.get() || |
path < fPathNameAllocator->firstName() || |
path >= fPathNameAllocator->endName()) { |
// If we aren't inside fPathNameAllocator's range then this name was |
@@ -276,7 +276,7 @@ void GrGLPathRendering::deletePaths(GrGLuint path, GrGLsizei range) { |
} |
// Make the path empty to save memory, but don't free the name in the driver. |
- GL_CALL(PathCommands(path, 0, NULL, 0, GR_GL_FLOAT, NULL)); |
+ GL_CALL(PathCommands(path, 0, nullptr, 0, GR_GL_FLOAT, nullptr)); |
fPathNameAllocator->free(path); |
} |