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

Unified Diff: src/core/SkDataTable.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/core/SkData.cpp ('k') | src/core/SkDeque.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkDataTable.cpp
diff --git a/src/core/SkDataTable.cpp b/src/core/SkDataTable.cpp
index 20bc4308530c7625e8463c71c979b3217a030c2e..32e30af64df6dd12dc0fa60e2730676877d8702c 100644
--- a/src/core/SkDataTable.cpp
+++ b/src/core/SkDataTable.cpp
@@ -16,9 +16,9 @@ static void malloc_freeproc(void* context) {
SkDataTable::SkDataTable() {
fCount = 0;
fElemSize = 0; // 0 signals that we use fDir instead of fElems
- fU.fDir = NULL;
- fFreeProc = NULL;
- fFreeProcContext = NULL;
+ fU.fDir = nullptr;
+ fFreeProc = nullptr;
+ fFreeProcContext = nullptr;
}
SkDataTable::SkDataTable(const void* array, size_t elemSize, int count,
@@ -78,7 +78,7 @@ const void* SkDataTable::at(int index, size_t* size) const {
SkDataTable* SkDataTable::NewEmpty() {
static SkDataTable* gEmpty;
- if (NULL == gEmpty) {
+ if (nullptr == gEmpty) {
gEmpty = new SkDataTable;
}
gEmpty->ref();
@@ -137,7 +137,7 @@ SkDataTable* SkDataTable::NewArrayProc(const void* array, size_t elemSize,
static void chunkalloc_freeproc(void* context) { delete (SkChunkAlloc*)context; }
SkDataTableBuilder::SkDataTableBuilder(size_t minChunkSize)
- : fHeap(NULL)
+ : fHeap(nullptr)
, fMinChunkSize(minChunkSize) {}
SkDataTableBuilder::~SkDataTableBuilder() { this->reset(); }
@@ -147,12 +147,12 @@ void SkDataTableBuilder::reset(size_t minChunkSize) {
fDir.reset();
if (fHeap) {
delete fHeap;
- fHeap = NULL;
+ fHeap = nullptr;
}
}
void SkDataTableBuilder::append(const void* src, size_t size) {
- if (NULL == fHeap) {
+ if (nullptr == fHeap) {
fHeap = new SkChunkAlloc(fMinChunkSize);
}
@@ -177,7 +177,7 @@ SkDataTable* SkDataTableBuilder::detachDataTable() {
SkDataTable* table = new SkDataTable((SkDataTable::Dir*)dir, count, chunkalloc_freeproc, fHeap);
// we have to detach our fHeap, since we are giving that to the table
- fHeap = NULL;
+ fHeap = nullptr;
fDir.reset();
return table;
}
« no previous file with comments | « src/core/SkData.cpp ('k') | src/core/SkDeque.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698