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

src/utils/SkPatchGrid.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPatchGrid.h"
 #include "SkPatchUtils.h"
 
 SkPatchGrid::SkPatchGrid(int rows, int cols, VertexType flags, SkXfermode* xfer)
     : fRows(0)
     , fCols(0)
     , fModeFlags(kNone_VertexType)
     , fCornerPts(NULL)
     , fCornerColors(NULL)
     , fTexCoords(NULL)
     , fHrzCtrlPts(NULL)
     , fVrtCtrlPts(NULL)
     , fXferMode(NULL) {
         this->reset(rows, cols, flags, xfer);
 }
 
 SkPatchGrid::~SkPatchGrid() {
-    SkDELETE_ARRAY(fCornerPts);
-    SkDELETE_ARRAY(fCornerColors);
-    SkDELETE_ARRAY(fTexCoords);
-    SkDELETE_ARRAY(fHrzCtrlPts);
-    SkDELETE_ARRAY(fVrtCtrlPts);
+    delete[] fCornerPts;
+    delete[] fCornerColors;
+    delete[] fTexCoords;
+    delete[] fHrzCtrlPts;
+    delete[] fVrtCtrlPts;
 }
 
 bool SkPatchGrid::setPatch(int x, int y, const SkPoint cubics[12], const SkColor colors[4],
                            const SkPoint texCoords[4]) {
     // Check for the passed paramaters to be within the range of the grid dimensions and a valid
     // pointer for the cubics' control points.
     if (x < 0 || y < 0 || x > fCols - 1 || y > fRows - 1 || NULL == cubics) {
         return false;
     }
     
@@ skipping 73 matching lines @@
         texCoords[0] = fTexCoords[cornerPos];
         texCoords[1] = fTexCoords[cornerPos + 1];
         texCoords[3] = fTexCoords[cornerPos + (fCols + 1)];
         texCoords[2] = fTexCoords[cornerPos + (fCols + 1) + 1];
     }
     
     return true;
 }
 
 void SkPatchGrid::reset(int rows, int cols, VertexType flags, SkXfermode* xMode) {
-    SkDELETE_ARRAY(fCornerPts);
-    SkDELETE_ARRAY(fCornerColors);
-    SkDELETE_ARRAY(fTexCoords);
-    SkDELETE_ARRAY(fHrzCtrlPts);
-    SkDELETE_ARRAY(fVrtCtrlPts);
-    
+    delete[] fCornerPts;
+    delete[] fCornerColors;
+    delete[] fTexCoords;
+    delete[] fHrzCtrlPts;
+    delete[] fVrtCtrlPts;
+
     fCols = cols;
     fRows = rows;
     fModeFlags = flags;
     fXferMode = xMode;
-    
-    fCornerPts = SkNEW_ARRAY(SkPoint, (fRows + 1) * (fCols + 1));
-    fHrzCtrlPts = SkNEW_ARRAY(SkPoint, (fRows + 1) * fCols * 2);
-    fVrtCtrlPts = SkNEW_ARRAY(SkPoint, fRows * 2 * (fCols + 1));
+
+    fCornerPts = new SkPoint[(fRows + 1) * (fCols + 1)];
+    fHrzCtrlPts = new SkPoint[(fRows + 1) * fCols * 2];
+    fVrtCtrlPts = new SkPoint[fRows * 2 * (fCols + 1)];
     memset(fCornerPts, 0, (fRows + 1) * (fCols + 1) * sizeof(SkPoint));
     memset(fHrzCtrlPts, 0, (fRows + 1) * fCols * 2 * sizeof(SkPoint));
     memset(fVrtCtrlPts, 0, fRows * 2 * (fCols + 1) * sizeof(SkPoint));
     
     if (fModeFlags & kColors_VertexType) {
-        fCornerColors = SkNEW_ARRAY(SkColor, (fRows + 1) * (fCols + 1));
+        fCornerColors = new SkColor[(fRows + 1) * (fCols + 1)];
         memset(fCornerColors, 0, (fRows + 1) * (fCols + 1) * sizeof(SkColor));
     }
     
     if (fModeFlags & kTexs_VertexType) {
-        fTexCoords = SkNEW_ARRAY(SkPoint, (fRows + 1) * (fCols + 1));
+        fTexCoords = new SkPoint[(fRows + 1) * (fCols + 1)];
         memset(fTexCoords, 0, (fRows + 1) * (fCols + 1) * sizeof(SkPoint));
     }
 }
 
 void SkPatchGrid::draw(SkCanvas* canvas, SkPaint& paint) {
-    int* maxCols = SkNEW_ARRAY(int, fCols);
-    int* maxRows = SkNEW_ARRAY(int, fRows);
+    int* maxCols = new int[fCols];
+    int* maxRows = new int[fRows];
     memset(maxCols, 0, fCols * sizeof(int));
     memset(maxRows, 0, fRows * sizeof(int));
     
     // Get the maximum level of detail per axis for each row and column
     for (int y = 0; y < fRows; y++) {
         for (int x = 0; x < fCols; x++) {
             SkPoint cubics[12];
             this->getPatch(x, y, cubics, NULL, NULL);
             SkMatrix matrix = canvas->getTotalMatrix();
             SkISize lod = SkPatchUtils::GetLevelOfDetail(cubics, &matrix);
@@ skipping 12 matching lines @@
             if (SkPatchUtils::getVertexData(&data, cubics,
                                             fModeFlags & kColors_VertexType ? colors : NULL,
                                             fModeFlags & kTexs_VertexType ? texCoords : NULL,
                                             maxCols[x], maxRows[y])) {
                 canvas->drawVertices(SkCanvas::kTriangles_VertexMode, data.fVertexCount,
                                      data.fPoints, data.fTexCoords, data.fColors, fXferMode,
                                      data.fIndices, data.fIndexCount, paint);
             }
         }
     }
-    SkDELETE_ARRAY(maxCols);
-    SkDELETE_ARRAY(maxRows);
+    delete[] maxCols;
+    delete[] maxRows;
 }