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

src/effects/SkTableColorFilter.cpp

 /*
 * Copyright 2015 Google Inc.
 *
 * Use of this source code is governed by a BSD-style license that can be
 * found in the LICENSE file.
 */
 
 #include "SkBitmap.h"
 #include "SkTableColorFilter.h"
 #include "SkColorPriv.h"
@@ skipping 24 matching lines @@
             memcpy(dst, tableG, 256);
             dst += 256;
             fFlags |= kG_Flag;
         }
         if (tableB) {
             memcpy(dst, tableB, 256);
             fFlags |= kB_Flag;
         }
     }
 
-    virtual ~SkTable_ColorFilter() {
-        SkDELETE(fBitmap);
-    }
+    virtual ~SkTable_ColorFilter() { delete fBitmap; }
 
     bool asComponentTable(SkBitmap* table) const override;
     SkColorFilter* newComposed(const SkColorFilter* inner) const override;
 
 #if SK_SUPPORT_GPU
     bool asFragmentProcessors(GrContext*, GrProcessorDataManager*,
                               SkTDArray<GrFragmentProcessor*>*) const override;
 #endif
 
     void filterSpan(const SkPMColor src[], int count, SkPMColor dst[]) const override;
@@ skipping 194 matching lines @@
     if (flags & kB_Flag) {
         b = ptr;
         ptr += 256;
     }
     return SkTableColorFilter::CreateARGB(a, r, g, b);
 }
 
 bool SkTable_ColorFilter::asComponentTable(SkBitmap* table) const {
     if (table) {
         if (NULL == fBitmap) {
-            SkBitmap* bmp = SkNEW(SkBitmap);
+            SkBitmap* bmp = new SkBitmap;
             bmp->allocPixels(SkImageInfo::MakeA8(256, 4));
             uint8_t* bitmapPixels = bmp->getAddr8(0, 0);
             int offset = 0;
             static const unsigned kFlags[] = { kA_Flag, kR_Flag, kG_Flag, kB_Flag };
 
             for (int x = 0; x < 4; ++x) {
                 if (!(fFlags & kFlags[x])) {
                     memcpy(bitmapPixels, gIdentityTable, sizeof(gIdentityTable));
                 } else {
                     memcpy(bitmapPixels, fStorage + offset, 256);
@@ skipping 202 matching lines @@
     int row = atlas->lockRow(bitmap);
     SkAutoTUnref<GrTexture> texture;
     if (-1 == row) {
         atlas = NULL;
         // Passing params=NULL because this effect does no tiling or filtering.
         texture.reset(GrRefCachedBitmapTexture(context, bitmap, NULL));
     } else {
         texture.reset(SkRef(atlas->getTexture()));
     }
 
-    return SkNEW_ARGS(ColorTableEffect, (texture, atlas, row, flags));
+    return new ColorTableEffect(texture, atlas, row, flags);
 }
 
 ColorTableEffect::ColorTableEffect(GrTexture* texture, GrTextureStripAtlas* atlas, int row,
                                    unsigned flags)
     : fTextureAccess(texture, "a")
     , fFlags(flags)
     , fAtlas(atlas)
     , fRow(row) {
     this->initClassID<ColorTableEffect>();
     this->addTextureAccess(&fTextureAccess);
 }
 
 ColorTableEffect::~ColorTableEffect() {
     if (fAtlas) {
         fAtlas->unlockRow(fRow);
     }
 }
 
 void ColorTableEffect::onGetGLProcessorKey(const GrGLSLCaps& caps,
                                          GrProcessorKeyBuilder* b) const {
     GLColorTableEffect::GenKey(*this, caps, b);
 }
 
 GrGLFragmentProcessor* ColorTableEffect::onCreateGLInstance() const {
-    return SkNEW_ARGS(GLColorTableEffect, (*this));
+    return new GLColorTableEffect(*this);
 }
 
 bool ColorTableEffect::onIsEqual(const GrFragmentProcessor& other) const {
     // For non-atlased instances, the texture (compared by base class) is sufficient to
     // differentiate different tables. For atlased instances we ensure they are using the
     // same row.
     const ColorTableEffect& that = other.cast<ColorTableEffect>();
     SkASSERT(SkToBool(fAtlas) == SkToBool(that.fAtlas));
     // Ok to always do this comparison since both would be -1 if non-atlased.
     return fRow == that.fRow;
@@ skipping 79 matching lines @@
 #else
     #define SK_A32_INDEX    (3 - (SK_A32_SHIFT >> 3))
     #define SK_R32_INDEX    (3 - (SK_R32_SHIFT >> 3))
     #define SK_G32_INDEX    (3 - (SK_G32_SHIFT >> 3))
     #define SK_B32_INDEX    (3 - (SK_B32_SHIFT >> 3))
 #endif
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkColorFilter* SkTableColorFilter::Create(const uint8_t table[256]) {
-    return SkNEW_ARGS(SkTable_ColorFilter, (table, table, table, table));
+    return new SkTable_ColorFilter(table, table, table, table);
 }
 
 SkColorFilter* SkTableColorFilter::CreateARGB(const uint8_t tableA[256],
                                               const uint8_t tableR[256],
                                               const uint8_t tableG[256],
                                               const uint8_t tableB[256]) {
-    return SkNEW_ARGS(SkTable_ColorFilter, (tableA, tableR, tableG, tableB));
+    return new SkTable_ColorFilter(tableA, tableR, tableG, tableB);
 }
 
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkTableColorFilter)
     SK_DEFINE_FLATTENABLE_REGISTRAR_ENTRY(SkTable_ColorFilter)
 SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_END