Index: src/core/SkMultiPictureDraw.cpp |
diff --git a/src/core/SkMultiPictureDraw.cpp b/src/core/SkMultiPictureDraw.cpp |
index 8cbb9ca60f5faf3964ada2d0a032590dd16210a7..4003808310e27682f80b00a3c110ce5ee7cdb788 100644 |
--- a/src/core/SkMultiPictureDraw.cpp |
+++ b/src/core/SkMultiPictureDraw.cpp |
@@ -37,7 +37,7 @@ void SkMultiPictureDraw::DrawData::init(SkCanvas* canvas, const SkPicture* pictu |
if (paint) { |
fPaint = new SkPaint(*paint); |
} else { |
- fPaint = NULL; |
+ fPaint = nullptr; |
} |
} |
@@ -68,8 +68,8 @@ void SkMultiPictureDraw::add(SkCanvas* canvas, |
const SkPicture* picture, |
const SkMatrix* matrix, |
const SkPaint* paint) { |
- if (NULL == canvas || NULL == picture) { |
- SkDEBUGFAIL("parameters to SkMultiPictureDraw::add should be non-NULL"); |
+ if (nullptr == canvas || nullptr == picture) { |
+ SkDEBUGFAIL("parameters to SkMultiPictureDraw::add should be non-nullptr"); |
return; |
} |
@@ -179,7 +179,7 @@ void SkMultiPictureDraw::draw(bool flush) { |
// Render the entire picture using new layers |
GrRecordReplaceDraw(picture, canvas, context->getLayerCache(), |
- initialMatrix, NULL); |
+ initialMatrix, nullptr); |
GrLayerHoister::UnlockLayers(context, needRendering); |
GrLayerHoister::UnlockLayers(context, recycled); |