Index: src/core/SkTLS.cpp |
diff --git a/src/core/SkTLS.cpp b/src/core/SkTLS.cpp |
index b22446bd98ad15d0b5125647d23a6e4e84a3b050..a47dc14b5af6a742e7400f34637751801439e766 100755 |
--- a/src/core/SkTLS.cpp |
+++ b/src/core/SkTLS.cpp |
@@ -56,8 +56,8 @@ void SkTLS::Destructor(void* ptr) { |
} |
void* SkTLS::Get(CreateProc createProc, DeleteProc deleteProc) { |
- if (NULL == createProc) { |
- return NULL; |
+ if (nullptr == createProc) { |
+ return nullptr; |
} |
void* ptr = SkTLS::PlatformGetSpecific(true); |
@@ -69,7 +69,7 @@ void* SkTLS::Get(CreateProc createProc, DeleteProc deleteProc) { |
SkASSERT(rec->fDeleteProc == deleteProc); |
return rec->fData; |
} |
- } while ((rec = rec->fNext) != NULL); |
+ } while ((rec = rec->fNext) != nullptr); |
// not found, so create a new one |
} |
@@ -86,8 +86,8 @@ void* SkTLS::Get(CreateProc createProc, DeleteProc deleteProc) { |
} |
void* SkTLS::Find(CreateProc createProc) { |
- if (NULL == createProc) { |
- return NULL; |
+ if (nullptr == createProc) { |
+ return nullptr; |
} |
void* ptr = SkTLS::PlatformGetSpecific(false); |
@@ -98,20 +98,20 @@ void* SkTLS::Find(CreateProc createProc) { |
if (rec->fCreateProc == createProc) { |
return rec->fData; |
} |
- } while ((rec = rec->fNext) != NULL); |
+ } while ((rec = rec->fNext) != nullptr); |
} |
- return NULL; |
+ return nullptr; |
} |
void SkTLS::Delete(CreateProc createProc) { |
- if (NULL == createProc) { |
+ if (nullptr == createProc) { |
return; |
} |
void* ptr = SkTLS::PlatformGetSpecific(false); |
SkTLSRec* curr = (SkTLSRec*)ptr; |
- SkTLSRec* prev = NULL; |
+ SkTLSRec* prev = nullptr; |
while (curr) { |
SkTLSRec* next = curr->fNext; |
if (curr->fCreateProc == createProc) { |