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

src/gpu/GrAtlas.cpp

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAtlas.h"
 #include "GrContext.h"
@@ skipping 15 matching lines @@
     , fRects(NULL)
     , fAtlas(NULL)
     , fBytesPerPixel(1)
     , fDirty(false)
     , fBatchUploads(false)
 {
     fOffset.set(0, 0);
 }
 
 GrPlot::~GrPlot() {
-    SkDELETE_ARRAY(fPlotData);
+    delete[] fPlotData;
     fPlotData = NULL;
     delete fRects;
 }
 
 void GrPlot::init(GrAtlas* atlas, int id, int offX, int offY, int width, int height, size_t bpp,
                   bool batchUploads) {
     fID = id;
     fRects = GrRectanizer::Factory(width, height);
     fAtlas = atlas;
     fOffset.set(offX * width, offY * height);
@@ skipping 13 matching lines @@
     float percentFull = fRects->percentFull();
     if (!fRects->addRect(width, height, loc)) {
         return false;
     }
 
     // if batching uploads, create backing memory on first use
     // once the plot is nearly full we will revert to uploading each subimage individually
     int plotWidth = fRects->width();
     int plotHeight = fRects->height();
     if (fBatchUploads && NULL == fPlotData && 0.0f == percentFull) {
-        fPlotData = SkNEW_ARRAY(unsigned char, fBytesPerPixel*plotWidth*plotHeight);
+        fPlotData = new unsigned char[fBytesPerPixel * plotWidth * plotHeight];
         memset(fPlotData, 0, fBytesPerPixel*plotWidth*plotHeight);
     }
 
     // if we have backing memory, copy to the memory and set for future upload
     if (fPlotData) {
         const unsigned char* imagePtr = (const unsigned char*) image;
         // point ourselves at the right starting spot
         unsigned char* dataPtr = fPlotData;
         dataPtr += fBytesPerPixel*plotWidth*loc->fY;
         dataPtr += fBytesPerPixel*loc->fX;
@@ skipping 50 matching lines @@
     int plotHeight = textureHeight / fNumPlotsY;
 
     SkASSERT(plotWidth * fNumPlotsX == textureWidth);
     SkASSERT(plotHeight * fNumPlotsY == textureHeight);
 
     // We currently do not support compressed atlases...
     SkASSERT(!GrPixelConfigIsCompressed(config));
 
     // set up allocated plots
     size_t bpp = GrBytesPerPixel(fPixelConfig);
-    fPlotArray = SkNEW_ARRAY(GrPlot, (fNumPlotsX*fNumPlotsY));
+    fPlotArray = new GrPlot[(fNumPlotsX * fNumPlotsY)];
 
     GrPlot* currPlot = fPlotArray;
     for (int y = numPlotsY-1; y >= 0; --y) {
         for (int x = numPlotsX-1; x >= 0; --x) {
             currPlot->init(this, y*numPlotsX+x, x, y, plotWidth, plotHeight, bpp, batchUploads);
 
             // build LRU list
             fPlotList.addToHead(currPlot);
             ++currPlot;
         }
     }
 }
 
 GrAtlas::~GrAtlas() {
     SkSafeUnref(fTexture);
-    SkDELETE_ARRAY(fPlotArray);
+    delete[] fPlotArray;
 
     fGpu->unref();
 #if FONT_CACHE_STATS
       SkDebugf("Num uploads: %d\n", g_UploadCount);
 #endif
 }
 
 void GrAtlas::makeMRU(GrPlot* plot) {
     if (fPlotList.head() == plot) {
         return;
@@ skipping 52 matching lines @@
     // If the above fails, then the current plot list has no room
     return NULL;
 }
 
 void GrAtlas::RemovePlot(ClientPlotUsage* usage, const GrPlot* plot) {
     int index = usage->fPlots.find(const_cast<GrPlot*>(plot));
     if (index >= 0) {
         usage->fPlots.remove(index);
     }
 }