diff options
| author |  halcanary <halcanary@google.com> | 2015-08-27 07:41:13 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-08-27 07:41:16 -0700 |
| commit | 96fcdcc219d2a0d3579719b84b28bede76efba64 (patch) | |
| tree | 0ec5ea0193d8292df8bf5ed9dd8498a5eb5763dd /src/lazy/SkCachingPixelRef.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/lazy/SkCachingPixelRef.cpp')
| -rw-r--r-- | src/lazy/SkCachingPixelRef.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lazy/SkCachingPixelRef.cpp b/src/lazy/SkCachingPixelRef.cpp index f65e5454a7..692e4ea3d6 100644 --- a/src/lazy/SkCachingPixelRef.cpp +++ b/src/lazy/SkCachingPixelRef.cpp @@ -11,8 +11,8 @@ bool SkCachingPixelRef::Install(SkImageGenerator* generator, SkBitmap* dst) { - SkASSERT(dst != NULL); - if (NULL == generator) { + SkASSERT(dst != nullptr); + if (nullptr == generator) { return false; } const SkImageInfo info = generator->getInfo(); @@ -32,7 +32,7 @@ SkCachingPixelRef::SkCachingPixelRef(const SkImageInfo& info, , fImageGenerator(generator) , fErrorInDecoding(false) , fRowBytes(rowBytes) { - SkASSERT(fImageGenerator != NULL); + SkASSERT(fImageGenerator != nullptr); } SkCachingPixelRef::~SkCachingPixelRef() { delete fImageGenerator; @@ -62,9 +62,9 @@ bool SkCachingPixelRef::onNewLockPixels(LockRec* rec) { // Now bitmap should contain a concrete PixelRef of the decoded image. void* pixels = fLockedBitmap.getPixels(); - SkASSERT(pixels != NULL); + SkASSERT(pixels != nullptr); rec->fPixels = pixels; - rec->fColorTable = NULL; + rec->fColorTable = nullptr; rec->fRowBytes = fLockedBitmap.rowBytes(); return true; } |