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

Unified Diff: src/animator/SkGetCondensedInfo.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/SkDump.cpp ('k') | src/animator/SkMatrixParts.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/animator/SkGetCondensedInfo.cpp
diff --git a/src/animator/SkGetCondensedInfo.cpp b/src/animator/SkGetCondensedInfo.cpp
index f2471bbed98ee6002465b085fc708b1834dd8efa..de6fa184b572b4bac1d3ea9f32068148eaf79f5b 100644
--- a/src/animator/SkGetCondensedInfo.cpp
+++ b/src/animator/SkGetCondensedInfo.cpp
@@ -53,7 +53,7 @@ static int _searchByType(SkDisplayTypes type) {
const SkMemberInfo* SkDisplayType::GetMembers(SkAnimateMaker* , SkDisplayTypes type, int* infoCountPtr) {
int lookup = _searchByType(type);
if (lookup < 0)
- return NULL;
+ return nullptr;
if (infoCountPtr)
*infoCountPtr = gInfoCounts[lookup];
return gInfoTables[lookup];
@@ -72,10 +72,10 @@ static const SkMemberInfo* _lookup(int lookup, const char** matchPtr) {
if (info->fType == SkType_BaseClassInfo) {
int baseTypeLookup = info->fOffset;
const SkMemberInfo* result = _lookup(baseTypeLookup, matchPtr);
- if (result != NULL)
+ if (result != nullptr)
return result;
if (--count == 0)
- return NULL;
+ return nullptr;
info++;
}
SkASSERT(info->fType != SkType_BaseClassInfo);
@@ -83,7 +83,7 @@ static const SkMemberInfo* _lookup(int lookup, const char** matchPtr) {
const char* strings = gInfoNames[lookup];
int index = _searchByName(&info->fName, count, strings, match);
if (index < 0)
- return NULL;
+ return nullptr;
return &info[index];
}
@@ -93,16 +93,16 @@ const SkMemberInfo* SkMemberInfo::Find(SkDisplayTypes type, int* index) {
if (info->fType == SkType_BaseClassInfo) {
int baseTypeLookup = info->fOffset;
const SkMemberInfo* result = Find(baseTypeLookup, index);
- if (result != NULL)
+ if (result != nullptr)
return result;
if (--count == 0)
- return NULL;
+ return nullptr;
info++;
}
SkASSERT(info->fType != SkType_BaseClassInfo);
if (*index >= count) {
*index -= count;
- return NULL;
+ return nullptr;
}
return &info[index];
}
« no previous file with comments | « src/animator/SkDump.cpp ('k') | src/animator/SkMatrixParts.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698