| Index: src/gpu/GrContextFactory.cpp
|
| diff --git a/src/gpu/GrContextFactory.cpp b/src/gpu/GrContextFactory.cpp
|
| index 1f371302f46a122db46799cfbcf141db1007eddd..d84e589f843be3218988c9a8b90cd7c45d310408 100755
|
| --- a/src/gpu/GrContextFactory.cpp
|
| +++ b/src/gpu/GrContextFactory.cpp
|
| @@ -55,8 +55,8 @@ GrContext* GrContextFactory::get(GLContextType type, GrGLStandard forcedGpuAPI)
|
| glCtx.reset(SkDebugGLContext::Create(forcedGpuAPI));
|
| break;
|
| }
|
| - if (NULL == glCtx.get()) {
|
| - return NULL;
|
| + if (nullptr == glCtx.get()) {
|
| + return nullptr;
|
| }
|
|
|
| SkASSERT(glCtx->isValid());
|
| @@ -66,11 +66,11 @@ GrContext* GrContextFactory::get(GLContextType type, GrGLStandard forcedGpuAPI)
|
| if (kNVPR_GLContextType != type) {
|
| glInterface.reset(GrGLInterfaceRemoveNVPR(glInterface));
|
| if (!glInterface) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| } else {
|
| if (!glInterface->hasExtension("GL_NV_path_rendering")) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| }
|
|
|
| @@ -82,7 +82,7 @@ GrContext* GrContextFactory::get(GLContextType type, GrGLStandard forcedGpuAPI)
|
| grCtx.reset(GrContext::Create(kOpenGL_GrBackend, p3dctx, fGlobalOptions));
|
| #endif
|
| if (!grCtx.get()) {
|
| - return NULL;
|
| + return nullptr;
|
| }
|
| // Warn if path rendering support is not available for the NVPR type.
|
| if (kNVPR_GLContextType == type) {
|
|
|