diff options
author | halcanary <halcanary@google.com> | 2015-08-26 13:07:48 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-08-26 13:07:49 -0700 |
commit | 385fe4d4b62d7d1dd76116dd570df3290a2f487b (patch) | |
tree | 53d982ff238828331e86acd44071a44162a8688c /src/gpu/gl/GrGLCreateNullInterface.cpp | |
parent | 5015176adf046ef906a2313b6e6b64b72cc84898 (diff) |
Style Change: SkNEW->new; SkDELETE->delete
DOCS_PREVIEW= https://skia.org/?cl=1316123003
Review URL: https://codereview.chromium.org/1316123003
Diffstat (limited to 'src/gpu/gl/GrGLCreateNullInterface.cpp')
-rw-r--r-- | src/gpu/gl/GrGLCreateNullInterface.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gpu/gl/GrGLCreateNullInterface.cpp b/src/gpu/gl/GrGLCreateNullInterface.cpp index 886aacdcb8..37d0285009 100644 --- a/src/gpu/gl/GrGLCreateNullInterface.cpp +++ b/src/gpu/gl/GrGLCreateNullInterface.cpp @@ -24,16 +24,16 @@ public: BufferObj(GrGLuint id) : fID(id), fDataPtr(NULL), fSize(0), fMapped(false) { } - ~BufferObj() { SkDELETE_ARRAY(fDataPtr); } + ~BufferObj() { delete[] fDataPtr; } void allocate(GrGLsizeiptr size, const GrGLchar* dataPtr) { if (fDataPtr) { SkASSERT(0 != fSize); - SkDELETE_ARRAY(fDataPtr); + delete[] fDataPtr; } fSize = size; - fDataPtr = SkNEW_ARRAY(char, size); + fDataPtr = new char[size]; } GrGLuint id() const { return fID; } @@ -82,14 +82,14 @@ public: if (kFreeListEnd == fFreeListHead) { // no free slots - create a new one id = fBuffers.count(); - buffer = SkNEW_ARGS(BufferObj, (id)); + buffer = new BufferObj(id); *fBuffers.append() = buffer; } else { // grab the head of the free list and advance the head to the next free slot. id = static_cast<GrGLuint>(fFreeListHead); fFreeListHead = reinterpret_cast<intptr_t>(fBuffers[id]); - buffer = SkNEW_ARGS(BufferObj, (id)); + buffer = new BufferObj(id); fBuffers[id] = buffer; } @@ -100,7 +100,7 @@ public: SkASSERT(fBuffers.count() > 0); GrGLuint id = buffer->id(); - SkDELETE(buffer); + delete buffer; fBuffers[id] = reinterpret_cast<BufferObj*>(fFreeListHead); fFreeListHead = id; @@ -141,8 +141,8 @@ public: , fCurrShaderID(0) {} private: - static void* Create() { return SkNEW(ThreadContext ); } - static void Delete(void* context) { SkDELETE(reinterpret_cast<ThreadContext *>(context)); } + static void* Create() { return new ThreadContext; } + static void Delete(void* context) { delete reinterpret_cast<ThreadContext*>(context); } }; // Functions not declared in GrGLBogusInterface.h (not common with the Debug GL interface). @@ -343,7 +343,7 @@ GrGLvoid GR_GL_FUNCTION_TYPE nullGLGetBufferParameteriv(GrGLenum target, GrGLenu } // end anonymous namespace const GrGLInterface* GrGLCreateNullInterface() { - GrGLInterface* interface = SkNEW(GrGLInterface); + GrGLInterface* interface = new GrGLInterface; interface->fStandard = kGL_GrGLStandard; |