Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(836)

Unified Diff: src/core/SkPixelRef.cpp

Issue 1316233002: Style Change: NULL->nullptr (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: 2015-08-27 (Thursday) 10:25:06 EDT Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkPictureShader.cpp ('k') | src/core/SkPixmap.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkPixelRef.cpp
diff --git a/src/core/SkPixelRef.cpp b/src/core/SkPixelRef.cpp
index 7bcaffe554b9dc2c21d94fbb740ad715d85c13bc..d7117617f62e4243c6b36935393df128b277b293 100644
--- a/src/core/SkPixelRef.cpp
+++ b/src/core/SkPixelRef.cpp
@@ -95,7 +95,7 @@ static void validate_pixels_ctable(const SkImageInfo& info, const SkColorTable*
if (kIndex_8_SkColorType == info.colorType()) {
SkASSERT(ctable);
} else {
- SkASSERT(NULL == ctable);
+ SkASSERT(nullptr == ctable);
}
}
@@ -198,8 +198,8 @@ bool SkPixelRef::requestLock(const LockRequest& request, LockResult* result) {
}
if (fPreLocked) {
- result->fUnlockProc = NULL;
- result->fUnlockContext = NULL;
+ result->fUnlockProc = nullptr;
+ result->fUnlockContext = nullptr;
result->fCTable = fRec.fColorTable;
result->fPixels = fRec.fPixels;
result->fRowBytes = fRec.fRowBytes;
@@ -241,7 +241,7 @@ uint32_t SkPixelRef::getGenerationID() const {
}
void SkPixelRef::addGenIDChangeListener(GenIDChangeListener* listener) {
- if (NULL == listener || !this->genIDIsUnique()) {
+ if (nullptr == listener || !this->genIDIsUnique()) {
// No point in tracking this if we're not going to call it.
delete listener;
return;
@@ -320,7 +320,7 @@ bool SkPixelRef::onReadPixels(SkBitmap* dst, const SkIRect* subset) {
void SkPixelRef::onNotifyPixelsChanged() { }
SkData* SkPixelRef::onRefEncodedData() {
- return NULL;
+ return nullptr;
}
bool SkPixelRef::onGetYUV8Planes(SkISize sizes[3], void* planes[3], size_t rowBytes[3],
« no previous file with comments | « src/core/SkPictureShader.cpp ('k') | src/core/SkPixmap.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698