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

DOCS_PREVIEW= https://skia.org/?cl=1316123003

Review URL: https://codereview.chromium.org/1316123003

15 files changed, 62 insertions, 62 deletions

diff --git a/src/utils/SkCamera.cpp b/src/utils/SkCamera.cpp
index d9f9cf5450..c7389cefeb 100644
--- a/src/utils/SkCamera.cpp
+++ b/src/utils/SkCamera.cpp
@@ -291,13 +291,13 @@ Sk3DView::~Sk3DView() {
     Rec* rec = fRec;
     while (rec != &fInitialRec) {
         Rec* next = rec->fNext;
-        SkDELETE(rec);
+        delete rec;
         rec = next;
     }
 }
 
 void Sk3DView::save() {
-    Rec* rec = SkNEW(Rec);
+    Rec* rec = new Rec;
     rec->fNext = fRec;
     rec->fMatrix = fRec->fMatrix;
     fRec = rec;
@@ -306,7 +306,7 @@ void Sk3DView::save() {
 void Sk3DView::restore() {
     SkASSERT(fRec != &fInitialRec);
     Rec* next = fRec->fNext;
-    SkDELETE(fRec);
+    delete fRec;
     fRec = next;
 }
 
diff --git a/src/utils/SkCanvasStateUtils.cpp b/src/utils/SkCanvasStateUtils.cpp
index 12ceefcf2f..8ab853dbf3 100644
--- a/src/utils/SkCanvasStateUtils.cpp
+++ b/src/utils/SkCanvasStateUtils.cpp
@@ -206,7 +206,7 @@ SkCanvasState* SkCanvasStateUtils::CaptureCanvasState(SkCanvas* canvas) {
         return NULL;
     }
 
-    SkAutoTDelete<SkCanvasState_v1> canvasState(SkNEW_ARGS(SkCanvasState_v1, (canvas)));
+    SkAutoTDelete<SkCanvasState_v1> canvasState(new SkCanvasState_v1(canvas));
 
     // decompose the total matrix and clip
     setup_MC_state(&canvasState->mcState, canvas->getTotalMatrix(),
@@ -311,7 +311,7 @@ static SkCanvas* create_canvas_from_canvas_layer(const SkCanvasLayerState& layer
     SkASSERT(!bitmap.empty());
     SkASSERT(!bitmap.isNull());
 
-    SkAutoTUnref<SkCanvas> canvas(SkNEW_ARGS(SkCanvas, (bitmap)));
+    SkAutoTUnref<SkCanvas> canvas(new SkCanvas(bitmap));
 
     // setup the matrix and clip
     setup_canvas_from_MC_state(layerState.mcState, canvas.get());
@@ -330,7 +330,7 @@ SkCanvas* SkCanvasStateUtils::CreateFromCanvasState(const SkCanvasState* state)
         return NULL;
     }
 
-    SkAutoTUnref<SkCanvasStack> canvas(SkNEW_ARGS(SkCanvasStack, (state->width, state->height)));
+    SkAutoTUnref<SkCanvasStack> canvas(new SkCanvasStack(state->width, state->height));
 
     // setup the matrix and clip on the n-way canvas
     setup_canvas_from_MC_state(state_v1->mcState, canvas);
@@ -355,5 +355,5 @@ void SkCanvasStateUtils::ReleaseCanvasState(SkCanvasState* state) {
     // Upcast to the correct version of SkCanvasState. This avoids having a virtual destructor on
     // SkCanvasState. That would be strange since SkCanvasState has no other virtual functions, and
     // instead uses the field "version" to determine how to behave.
-    SkDELETE(static_cast<SkCanvasState_v1*>(state));
+    delete static_cast<SkCanvasState_v1*>(state);
 }
diff --git a/src/utils/SkEventTracer.cpp b/src/utils/SkEventTracer.cpp
index 6176e1c44b..1c916ed2f6 100644
--- a/src/utils/SkEventTracer.cpp
+++ b/src/utils/SkEventTracer.cpp
@@ -47,7 +47,7 @@ void SkEventTracer::SetInstance(SkEventTracer* tracer) {
     SkASSERT(nullptr == sk_atomic_load(&gUserTracer, sk_memory_order_acquire));
     sk_atomic_store(&gUserTracer, tracer, sk_memory_order_release);
     // An atomic load during process shutdown is probably overkill, but safe overkill.
-    atexit([](){ SkDELETE(sk_atomic_load(&gUserTracer, sk_memory_order_acquire)); });
+    atexit([]() { delete sk_atomic_load(&gUserTracer, sk_memory_order_acquire); });
 }
 
 SkEventTracer* SkEventTracer::GetInstance() {
diff --git a/src/utils/SkFrontBufferedStream.cpp b/src/utils/SkFrontBufferedStream.cpp
index beead37a95..08364d15eb 100644
--- a/src/utils/SkFrontBufferedStream.cpp
+++ b/src/utils/SkFrontBufferedStream.cpp
@@ -69,7 +69,7 @@ SkStreamRewindable* SkFrontBufferedStream::Create(SkStream* stream, size_t buffe
     if (NULL == stream) {
         return NULL;
     }
-    return SkNEW_ARGS(FrontBufferedStream, (stream, bufferSize));
+    return new FrontBufferedStream(stream, bufferSize);
 }
 
 FrontBufferedStream::FrontBufferedStream(SkStream* stream, size_t bufferSize)
diff --git a/src/utils/SkImageGeneratorUtils.cpp b/src/utils/SkImageGeneratorUtils.cpp
index f5198c05fe..c9b2252d16 100644
--- a/src/utils/SkImageGeneratorUtils.cpp
+++ b/src/utils/SkImageGeneratorUtils.cpp
@@ -14,7 +14,7 @@ public:
 };
 
 SkImageGenerator* SkImageGeneratorUtils::NewEmpty(const SkImageInfo& info) {
-    return SkNEW_ARGS(GeneratorFromEmpty, (info));
+    return new GeneratorFromEmpty(info);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -38,7 +38,7 @@ private:
 };
 
 SkImageGenerator* SkImageGeneratorUtils::NewFromBitmap(const SkBitmap& bm) {
-    return SkNEW_ARGS(GeneratorFromBitmap, (bm));
+    return new GeneratorFromBitmap(bm);
 }
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
@@ -91,7 +91,7 @@ SkImageGenerator* SkImageGeneratorUtils::NewFromTexture(GrContext* ctx, GrTextur
         }
         const SkAlphaType at = kPremul_SkAlphaType; // take isOpaque from caller?
         SkImageInfo info = SkImageInfo::Make(desc.fWidth, desc.fHeight, ct, at, cpt);
-        return SkNEW_ARGS(GeneratorFromTexture, (ctx, tex, info));
+        return new GeneratorFromTexture(ctx, tex, info);
     }
 #endif
     return nullptr;
@@ -126,7 +126,7 @@ SkImageGenerator* SkImageGeneratorUtils::NewFromImage(const SkImage* image) {
         const SkColorType ct = kN32_SkColorType;
         const SkAlphaType at = image->isOpaque() ? kOpaque_SkAlphaType : kPremul_SkAlphaType;
         const SkImageInfo info = SkImageInfo::Make(image->width(), image->height(), ct, at);
-        return SkNEW_ARGS(GeneratorFromImage, (image, info));
+        return new GeneratorFromImage(image, info);
     }
     return nullptr;
 }
diff --git a/src/utils/SkNullCanvas.cpp b/src/utils/SkNullCanvas.cpp
index 866a361497..b5ee8d30a1 100644
--- a/src/utils/SkNullCanvas.cpp
+++ b/src/utils/SkNullCanvas.cpp
@@ -14,5 +14,5 @@
 SkCanvas* SkCreateNullCanvas() {
     // An N-Way canvas forwards calls to N canvas's. When N == 0 it's
     // effectively a null canvas.
-    return SkNEW_ARGS(SkNWayCanvas, (0,0));
+    return new SkNWayCanvas(0, 0);
 }
diff --git a/src/utils/SkPatchGrid.cpp b/src/utils/SkPatchGrid.cpp
index 96e3c8f25e..386e3a633d 100644
--- a/src/utils/SkPatchGrid.cpp
+++ b/src/utils/SkPatchGrid.cpp
@@ -22,11 +22,11 @@ SkPatchGrid::SkPatchGrid(int rows, int cols, VertexType flags, SkXfermode* 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],
@@ -120,38 +120,38 @@ bool SkPatchGrid::getPatch(int x, int y, SkPoint cubics[12], SkColor colors[4],
 }
 
 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));
     
@@ -184,6 +184,6 @@ void SkPatchGrid::draw(SkCanvas* canvas, SkPaint& paint) {
             }
         }
     }
-    SkDELETE_ARRAY(maxCols);
-    SkDELETE_ARRAY(maxRows);
+    delete[] maxCols;
+    delete[] maxRows;
 }
diff --git a/src/utils/SkPatchUtils.cpp b/src/utils/SkPatchUtils.cpp
index 08fd4389d3..e9ff906dd2 100644
--- a/src/utils/SkPatchUtils.cpp
+++ b/src/utils/SkPatchUtils.cpp
@@ -217,10 +217,10 @@ bool SkPatchUtils::getVertexData(SkPatchUtils::VertexData* data, const SkPoint c
         data->fVertexCount = (lodX + 1) * (lodY + 1);
     }
     data->fIndexCount = lodX * lodY * 6;
-    
-    data->fPoints = SkNEW_ARRAY(SkPoint, data->fVertexCount);
-    data->fIndices = SkNEW_ARRAY(uint16_t, data->fIndexCount);
-    
+
+    data->fPoints = new SkPoint[data->fVertexCount];
+    data->fIndices = new uint16_t[data->fIndexCount];
+
     // if colors is not null then create array for colors
     SkPMColor colorsPM[kNumCorners];
     if (colors) {
@@ -228,12 +228,12 @@ bool SkPatchUtils::getVertexData(SkPatchUtils::VertexData* data, const SkPoint c
         for (int i = 0; i < kNumCorners; i++) {
             colorsPM[i] = SkPreMultiplyColor(colors[i]);
         }
-        data->fColors = SkNEW_ARRAY(uint32_t, data->fVertexCount);
+        data->fColors = new uint32_t[data->fVertexCount];
     }
     
     // if texture coordinates are not null then create array for them
     if (texCoords) {
-        data->fTexCoords = SkNEW_ARRAY(SkPoint, data->fVertexCount);
+        data->fTexCoords = new SkPoint[data->fVertexCount];
     }
     
     SkPoint pts[kNumPtsCubic];
diff --git a/src/utils/SkPatchUtils.h b/src/utils/SkPatchUtils.h
index 879053ad0c..3560421f4a 100644
--- a/src/utils/SkPatchUtils.h
+++ b/src/utils/SkPatchUtils.h
@@ -35,10 +35,10 @@ public:
         , fIndices(NULL) { }
         
         ~VertexData() {
-            SkDELETE_ARRAY(fPoints);
-            SkDELETE_ARRAY(fTexCoords);
-            SkDELETE_ARRAY(fColors);
-            SkDELETE_ARRAY(fIndices);
+            delete[] fPoints;
+            delete[] fTexCoords;
+            delete[] fColors;
+            delete[] fIndices;
         }
     };
     
diff --git a/src/utils/SkRTConf.cpp b/src/utils/SkRTConf.cpp
index 5c99d2706c..f441bf143b 100644
--- a/src/utils/SkRTConf.cpp
+++ b/src/utils/SkRTConf.cpp
@@ -46,8 +46,8 @@ SkRTConfRegistry::SkRTConfRegistry(): fConfs(100) {
             continue;
         }
 
-        SkString* key = SkNEW_ARGS(SkString,(keyptr));
-        SkString* val = SkNEW_ARGS(SkString,(valptr));
+        SkString *key = new SkString(keyptr);
+        SkString *val = new SkString(valptr);
 
         fConfigFileKeys.append(1, &key);
         fConfigFileValues.append(1, &val);
@@ -64,8 +64,8 @@ SkRTConfRegistry::~SkRTConfRegistry() {
     }
 
     for (int i = 0 ; i < fConfigFileKeys.count() ; i++) {
-        SkDELETE(fConfigFileKeys[i]);
-        SkDELETE(fConfigFileValues[i]);
+        delete fConfigFileKeys[i];
+        delete fConfigFileValues[i];
     }
 }
 
diff --git a/src/utils/debugger/SkDebugCanvas.cpp b/src/utils/debugger/SkDebugCanvas.cpp
index 6251c1b7a1..5ce9067546 100644
--- a/src/utils/debugger/SkDebugCanvas.cpp
+++ b/src/utils/debugger/SkDebugCanvas.cpp
@@ -58,12 +58,15 @@ public:
 
 class DebugPaintFilterCanvas : public SkPaintFilterCanvas {
 public:
-    DebugPaintFilterCanvas(int width, int height, bool overdrawViz, bool overrideFilterQuality,
+    DebugPaintFilterCanvas(int width,
+                           int height,
+                           bool overdrawViz,
+                           bool overrideFilterQuality,
                            SkFilterQuality quality)
         : INHERITED(width, height)
-        , fOverdrawXfermode(overdrawViz ? SkNEW(OverdrawXfermode) : NULL)
+        , fOverdrawXfermode(overdrawViz ? new OverdrawXfermode : NULL)
         , fOverrideFilterQuality(overrideFilterQuality)
-        , fFilterQuality(quality) { }
+        , fFilterQuality(quality) {}
 
 protected:
     void onFilterPaint(SkPaint* paint, Type) const override {
@@ -361,11 +364,8 @@ void SkDebugCanvas::updatePaintFilterCanvas() {
     }
 
     const SkImageInfo info = this->imageInfo();
-    fPaintFilterCanvas.reset(SkNEW_ARGS(DebugPaintFilterCanvas, (info.width(),
-                                                                 info.height(),
-                                                                 fOverdrawViz,
-                                                                 fOverrideFilterQuality,
-                                                                 fFilterQuality)));
+    fPaintFilterCanvas.reset(new DebugPaintFilterCanvas(info.width(), info.height(), fOverdrawViz,
+                                                        fOverrideFilterQuality, fFilterQuality));
 }
 
 void SkDebugCanvas::setOverdrawViz(bool overdrawViz) {
diff --git a/src/utils/debugger/SkObjectParser.cpp b/src/utils/debugger/SkObjectParser.cpp
index 3807fad59b..cba8d067e1 100644
--- a/src/utils/debugger/SkObjectParser.cpp
+++ b/src/utils/debugger/SkObjectParser.cpp
@@ -201,7 +201,7 @@ SkString* SkObjectParser::PathToString(const SkPath& path) {
 
     if (boundStr) {
         mPath->append(*boundStr);
-        SkDELETE(boundStr);
+        delete boundStr;
     }
 
     return mPath;
diff --git a/src/utils/mac/SkStream_mac.cpp b/src/utils/mac/SkStream_mac.cpp
index 26884711ed..e62ced220f 100644
--- a/src/utils/mac/SkStream_mac.cpp
+++ b/src/utils/mac/SkStream_mac.cpp
@@ -20,7 +20,7 @@ static void delete_stream_proc(void* info, const void* addr, size_t size) {
     SkStream* stream = (SkStream*)info;
     SkASSERT(stream->getMemoryBase() == addr);
     SkASSERT(stream->getLength() == size);
-    SkDELETE(stream);
+    delete stream;
 }
 
 // These are used by CGDataProviderSequentialCallbacks
@@ -42,7 +42,7 @@ static void rewind_proc(void* info) {
 // Used when info is an SkStream.
 static void release_info_proc(void* info) {
     SkASSERT(info);
-    SkDELETE((SkStream*)info);
+    delete (SkStream*)info;
 }
 
 CGDataProviderRef SkCreateDataProviderFromStream(SkStream* stream) {
diff --git a/src/utils/win/SkDWriteFontFileStream.cpp b/src/utils/win/SkDWriteFontFileStream.cpp
index a18760111c..eb7e5dccaf 100644
--- a/src/utils/win/SkDWriteFontFileStream.cpp
+++ b/src/utils/win/SkDWriteFontFileStream.cpp
@@ -85,7 +85,7 @@ bool SkDWriteFontFileStream::rewind() {
 }
 
 SkDWriteFontFileStream* SkDWriteFontFileStream::duplicate() const {
-    return SkNEW_ARGS(SkDWriteFontFileStream, (fFontFileStream.get()));
+    return new SkDWriteFontFileStream(fFontFileStream.get());
 }
 
 size_t SkDWriteFontFileStream::getPosition() const {
diff --git a/src/utils/win/SkWGL_win.cpp b/src/utils/win/SkWGL_win.cpp
index 5c461385a4..60f3cb34a4 100644
--- a/src/utils/win/SkWGL_win.cpp
+++ b/src/utils/win/SkWGL_win.cpp
@@ -432,7 +432,7 @@ SkWGLPbufferContext* SkWGLPbufferContext::Create(HDC parentDC, int msaaSampleCou
                 if (dc) {
                     HGLRC glrc = create_gl_context(dc, extensions, contextType);
                     if (glrc) {
-                        return SkNEW_ARGS(SkWGLPbufferContext, (pbuf, dc, glrc));
+                        return new SkWGLPbufferContext(pbuf, dc, glrc);
                     }
                     extensions.releasePbufferDC(pbuf, dc);
                 }