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

Unified Diff: src/animator/SkTypedArray.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/animator/SkTextToPath.cpp ('k') | src/codec/SkBmpCodec.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/animator/SkTypedArray.cpp
diff --git a/src/animator/SkTypedArray.cpp b/src/animator/SkTypedArray.cpp
index e94e57dca7efffc766f43739face0a640c4dc6d1..d9e2bc7f7300f2b206a44f46a237c0ad81f52d30 100644
--- a/src/animator/SkTypedArray.cpp
+++ b/src/animator/SkTypedArray.cpp
@@ -29,18 +29,18 @@ bool SkTypedArray::getIndex(int index, SkOperand* operand) {
SkDS32Array::SkDS32Array()
{
fReserve = fCount = 0;
- fArray = NULL;
+ fArray = nullptr;
#ifdef SK_DEBUG
- fData = NULL;
+ fData = nullptr;
#endif
}
SkDS32Array::SkDS32Array(const SkDS32Array& src)
{
fReserve = fCount = 0;
- fArray = NULL;
+ fArray = nullptr;
#ifdef SK_DEBUG
- fData = NULL;
+ fData = nullptr;
#endif
SkDS32Array tmp(src.fArray, src.fCount);
this->swap(tmp);
@@ -51,9 +51,9 @@ SkDS32Array::SkDS32Array(const int32_t src[], U16CPU count)
SkASSERT(src || count == 0);
fReserve = fCount = 0;
- fArray = NULL;
+ fArray = nullptr;
#ifdef SK_DEBUG
- fData = NULL;
+ fData = nullptr;
#endif
if (count)
{
@@ -105,7 +105,7 @@ int32_t* SkDS32Array::append(U16CPU count, const int32_t* src)
unsigned oldCount = fCount;
if (count)
{
- SkASSERT(src == NULL || fArray == NULL ||
+ SkASSERT(src == nullptr || fArray == nullptr ||
src + count <= fArray || fArray + count <= src);
this->growBy(count);
« no previous file with comments | « src/animator/SkTextToPath.cpp ('k') | src/codec/SkBmpCodec.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698