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

Unified Diff: src/gpu/GrGpuResourceRef.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/gpu/GrGpuResource.cpp ('k') | src/gpu/GrInOrderCommandBuilder.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrGpuResourceRef.cpp
diff --git a/src/gpu/GrGpuResourceRef.cpp b/src/gpu/GrGpuResourceRef.cpp
index 9e0e6f8e50b6e94cdf105a6463b074fbdc434d37..405679d4f17d6c8140b05748f0c0811a59e153a1 100644
--- a/src/gpu/GrGpuResourceRef.cpp
+++ b/src/gpu/GrGpuResourceRef.cpp
@@ -8,13 +8,13 @@
#include "GrGpuResourceRef.h"
GrGpuResourceRef::GrGpuResourceRef() {
- fResource = NULL;
+ fResource = nullptr;
fOwnRef = false;
fPendingIO = false;
}
GrGpuResourceRef::GrGpuResourceRef(GrGpuResource* resource, GrIOType ioType) {
- fResource = NULL;
+ fResource = nullptr;
fOwnRef = false;
fPendingIO = false;
this->setResource(resource, ioType);
@@ -47,7 +47,7 @@ void GrGpuResourceRef::reset() {
if (fOwnRef) {
fResource->unref();
fOwnRef = false;
- fResource = NULL;
+ fResource = nullptr;
}
}
@@ -55,8 +55,8 @@ void GrGpuResourceRef::setResource(GrGpuResource* resource, GrIOType ioType) {
SkASSERT(!fPendingIO);
SkASSERT(SkToBool(fResource) == fOwnRef);
SkSafeUnref(fResource);
- if (NULL == resource) {
- fResource = NULL;
+ if (nullptr == resource) {
+ fResource = nullptr;
fOwnRef = false;
} else {
fResource = resource;
« no previous file with comments | « src/gpu/GrGpuResource.cpp ('k') | src/gpu/GrInOrderCommandBuilder.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698