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

Unified Diff: src/gpu/GrGeometryBuffer.h

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/GrFontScaler.cpp ('k') | src/gpu/GrGlyph.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/gpu/GrGeometryBuffer.h
diff --git a/src/gpu/GrGeometryBuffer.h b/src/gpu/GrGeometryBuffer.h
index adccbf80e4aca4c69ec5f516860fef695d9d2e1c..56a6cae3fb08f32f8e3e7fcbbb276ba81620b858 100644
--- a/src/gpu/GrGeometryBuffer.h
+++ b/src/gpu/GrGeometryBuffer.h
@@ -48,7 +48,7 @@ public:
* Note that buffer mapping does not go through GrContext and therefore is
* not serialized with other operations.
*
- * @return a pointer to the data or NULL if the map fails.
+ * @return a pointer to the data or nullptr if the map fails.
*/
void* map() { return (fMapPtr = this->onMap()); }
@@ -60,14 +60,14 @@ public:
void unmap() {
SkASSERT(fMapPtr);
this->onUnmap();
- fMapPtr = NULL;
+ fMapPtr = nullptr;
}
/**
- * Returns the same ptr that map() returned at time of map or NULL if the
+ * Returns the same ptr that map() returned at time of map or nullptr if the
* is not mapped.
*
- * @return ptr to mapped buffer data or NULL if buffer is not mapped.
+ * @return ptr to mapped buffer data or nullptr if buffer is not mapped.
*/
void* mapPtr() const { return fMapPtr; }
@@ -101,7 +101,7 @@ public:
protected:
GrGeometryBuffer(GrGpu* gpu, size_t gpuMemorySize, bool dynamic, bool cpuBacked)
: INHERITED(gpu, kCached_LifeCycle)
- , fMapPtr(NULL)
+ , fMapPtr(nullptr)
, fGpuMemorySize(gpuMemorySize)
, fDynamic(dynamic)
, fCPUBacked(cpuBacked) {}
« no previous file with comments | « src/gpu/GrFontScaler.cpp ('k') | src/gpu/GrGlyph.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698