Style Change: SkNEW->new; SkDELETE->delete

src/gpu/effects/GrTextureStripAtlas.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrTextureStripAtlas.h"
 #include "SkPixelRef.h"
 #include "SkTSearch.h"
 #include "GrTexture.h"
 
 #ifdef SK_DEBUG
     #define VALIDATE this->validate()
 #else
     #define VALIDATE
 #endif
 
 class GrTextureStripAtlas::Hash : public SkTDynamicHash<GrTextureStripAtlas::AtlasEntry, 
                                                         GrTextureStripAtlas::Desc> {};
 
 int32_t GrTextureStripAtlas::gCacheCount = 0;
 
 GrTextureStripAtlas::Hash* GrTextureStripAtlas::gAtlasCache = NULL;
 
 GrTextureStripAtlas::Hash* GrTextureStripAtlas::GetCache() {
 
     if (NULL == gAtlasCache) {
-        gAtlasCache = SkNEW(Hash);
+        gAtlasCache = new Hash;
     }
 
     return gAtlasCache;
 }
 
 // Remove the specified atlas from the cache
 void GrTextureStripAtlas::CleanUp(const GrContext*, void* info) {
     SkASSERT(info);
 
     AtlasEntry* entry = static_cast<AtlasEntry*>(info);
 
     // remove the cache entry
     GetCache()->remove(entry->fDesc);
 
     // remove the actual entry
-    SkDELETE(entry);
+    delete entry;
 
     if (0 == GetCache()->count()) {
-        SkDELETE(gAtlasCache);
+        delete gAtlasCache;
         gAtlasCache = NULL;
     }
 }
 
 GrTextureStripAtlas* GrTextureStripAtlas::GetAtlas(const GrTextureStripAtlas::Desc& desc) {
     AtlasEntry* entry = GetCache()->find(desc);
     if (NULL == entry) {
-        entry = SkNEW(AtlasEntry);
+        entry = new AtlasEntry;
 
-        entry->fAtlas = SkNEW_ARGS(GrTextureStripAtlas, (desc));
+        entry->fAtlas = new GrTextureStripAtlas(desc);
         entry->fDesc = desc;
 
         desc.fContext->addCleanUp(CleanUp, entry);
 
         GetCache()->add(entry);
     }
 
     return entry->fAtlas;
 }
 
 GrTextureStripAtlas::GrTextureStripAtlas(GrTextureStripAtlas::Desc desc)
     : fCacheKey(sk_atomic_inc(&gCacheCount))
     , fLockedRows(0)
     , fDesc(desc)
     , fNumRows(desc.fHeight / desc.fRowHeight)
     , fTexture(NULL)
-    , fRows(SkNEW_ARRAY(AtlasRow, fNumRows))
+    , fRows(new AtlasRow[fNumRows])
     , fLRUFront(NULL)
     , fLRUBack(NULL) {
     SkASSERT(fNumRows * fDesc.fRowHeight == fDesc.fHeight);
     this->initLRU();
     fNormalizedYHeight = SK_Scalar1 / fDesc.fHeight;
     VALIDATE;
 }
 
-GrTextureStripAtlas::~GrTextureStripAtlas() {
-    SkDELETE_ARRAY(fRows);
-}
+GrTextureStripAtlas::~GrTextureStripAtlas() { delete[] fRows; }
 
 int GrTextureStripAtlas::lockRow(const SkBitmap& data) {
     VALIDATE;
     if (0 == fLockedRows) {
         this->lockTexture();
         if (!fTexture) {
             return -1;
         }
     }
 
@@ skipping 244 matching lines @@
 
     // If we have locked rows, we should have a locked texture, otherwise
     // it should be unlocked
     if (fLockedRows == 0) {
         SkASSERT(NULL == fTexture);
     } else {
         SkASSERT(fTexture);
     }
 }
 #endif