Index: src/image/SkSurface.cpp |
diff --git a/src/image/SkSurface.cpp b/src/image/SkSurface.cpp |
index 8c356a8080c818f5cb937da10cb3574ca78f39c7..0315f6cc84c884467c92dd93e5952ba97c3188dc 100644 |
--- a/src/image/SkSurface.cpp |
+++ b/src/image/SkSurface.cpp |
@@ -57,21 +57,21 @@ SkSurfaceProps::SkSurfaceProps(const SkSurfaceProps& other) |
SkSurface_Base::SkSurface_Base(int width, int height, const SkSurfaceProps* props) |
: INHERITED(width, height, props) |
{ |
- fCachedCanvas = NULL; |
- fCachedImage = NULL; |
+ fCachedCanvas = nullptr; |
+ fCachedImage = nullptr; |
} |
SkSurface_Base::SkSurface_Base(const SkImageInfo& info, const SkSurfaceProps* props) |
: INHERITED(info, props) |
{ |
- fCachedCanvas = NULL; |
- fCachedImage = NULL; |
+ fCachedCanvas = nullptr; |
+ fCachedImage = nullptr; |
} |
SkSurface_Base::~SkSurface_Base() { |
// in case the canvas outsurvives us, we null the callback |
if (fCachedCanvas) { |
- fCachedCanvas->setSurfaceBase(NULL); |
+ fCachedCanvas->setSurfaceBase(nullptr); |
} |
SkSafeUnref(fCachedImage); |
@@ -107,7 +107,7 @@ void SkSurface_Base::aboutToDraw(ContentChangeMode mode) { |
// regardless of copy-on-write, we must drop our cached image now, so |
// that the next request will get our new contents. |
fCachedImage->unref(); |
- fCachedImage = NULL; |
+ fCachedImage = nullptr; |
if (unique) { |
// Our content isn't held by any image now, so we can consider that content mutable. |
@@ -200,22 +200,22 @@ bool SkSurface::getRenderTargetHandle(GrBackendObject* obj, BackendHandleAccess |
#if !SK_SUPPORT_GPU |
SkSurface* SkSurface::NewRenderTargetDirect(GrRenderTarget*, const SkSurfaceProps*) { |
- return NULL; |
+ return nullptr; |
} |
SkSurface* SkSurface::NewRenderTarget(GrContext*, Budgeted, const SkImageInfo&, int, |
const SkSurfaceProps*) { |
- return NULL; |
+ return nullptr; |
} |
SkSurface* SkSurface::NewFromBackendTexture(GrContext*, const GrBackendTextureDesc&, |
const SkSurfaceProps*) { |
- return NULL; |
+ return nullptr; |
} |
SkSurface* SkSurface::NewFromBackendRenderTarget(GrContext*, const GrBackendRenderTargetDesc&, |
const SkSurfaceProps*) { |
- return NULL; |
+ return nullptr; |
} |
#endif |