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

src/image/SkSurface_Gpu.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 "SkSurface_Gpu.h"
 
 #include "SkCanvas.h"
@@ skipping 48 matching lines @@
     GrRenderTarget* rt = prepare_rt_for_external_access(this, access);
     *obj = rt->getRenderTargetHandle();
     return true;
 }
 
 SkCanvas* SkSurface_Gpu::onNewCanvas() {
     SkCanvas::InitFlags flags = SkCanvas::kDefault_InitFlags;
     // When we think this works...
 //    flags |= SkCanvas::kConservativeRasterClip_InitFlag;
 
-    return SkNEW_ARGS(SkCanvas, (fDevice, flags));
+    return new SkCanvas(fDevice, flags);
 }
 
 SkSurface* SkSurface_Gpu::onNewSurface(const SkImageInfo& info) {
     GrRenderTarget* rt = fDevice->accessRenderTarget();
     int sampleCount = rt->numColorSamples();
     // TODO: Make caller specify this (change virtual signature of onNewSurface).
     static const Budgeted kBudgeted = kNo_Budgeted;
     return SkSurface::NewRenderTarget(fDevice->context(), kBudgeted, info, sampleCount,
                                       &this->props());
 }
 
 SkImage* SkSurface_Gpu::onNewImageSnapshot(Budgeted budgeted) {
     const SkImageInfo info = fDevice->imageInfo();
     const int sampleCount = fDevice->accessRenderTarget()->numColorSamples();
     SkImage* image = NULL;
     GrTexture* tex = fDevice->accessRenderTarget()->asTexture();
     if (tex) {
-        image = SkNEW_ARGS(SkImage_Gpu,
-                           (info.width(), info.height(), kNeedNewImageUniqueID, info.alphaType(),
-                            tex, sampleCount, budgeted));
+        image = new SkImage_Gpu(info.width(), info.height(), kNeedNewImageUniqueID,
+                                info.alphaType(), tex, sampleCount, budgeted);
     }
     if (image) {
         as_IB(image)->initWithProps(this->props());
     }
     return image;
 }
 
 // Create a new render target and, if necessary, copy the contents of the old
 // render target into it. Note that this flushes the SkGpuDevice but
 // doesn't force an OpenGL flush.
@@ skipping 16 matching lines @@
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 SkSurface* SkSurface::NewRenderTargetDirect(GrRenderTarget* target, const SkSurfaceProps* props) {
     SkAutoTUnref<SkGpuDevice> device(
         SkGpuDevice::Create(target, props, SkGpuDevice::kUninit_InitContents));
     if (!device) {
         return NULL;
     }
-    return SkNEW_ARGS(SkSurface_Gpu, (device));
+    return new SkSurface_Gpu(device);
 }
 
 SkSurface* SkSurface::NewRenderTarget(GrContext* ctx, Budgeted budgeted, const SkImageInfo& info,
                                       int sampleCount, const SkSurfaceProps* props) {
     SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(ctx, budgeted, info, sampleCount, props,
                                                          SkGpuDevice::kClear_InitContents));
     if (!device) {
         return NULL;
     }
-    return SkNEW_ARGS(SkSurface_Gpu, (device));
+    return new SkSurface_Gpu(device);
 }
 
 SkSurface* SkSurface::NewFromBackendTexture(GrContext* context, const GrBackendTextureDesc& desc,
                                             const SkSurfaceProps* props) {
     if (NULL == context) {
         return NULL;
     }
     if (!SkToBool(desc.fFlags & kRenderTarget_GrBackendTextureFlag)) {
         return NULL;
     }
     SkAutoTUnref<GrSurface> surface(context->textureProvider()->wrapBackendTexture(desc,
                                     kBorrow_GrWrapOwnership));
     if (!surface) {
         return NULL;
     }
     SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(surface->asRenderTarget(), props,
                                                          SkGpuDevice::kUninit_InitContents));
     if (!device) {
         return NULL;
     }
-    return SkNEW_ARGS(SkSurface_Gpu, (device));
+    return new SkSurface_Gpu(device);
 }
 
 SkSurface* SkSurface::NewFromBackendRenderTarget(GrContext* context,
                                                  const GrBackendRenderTargetDesc& desc,
                                                  const SkSurfaceProps* props) {
     if (NULL == context) {
         return NULL;
     }
     SkAutoTUnref<GrRenderTarget> rt(context->textureProvider()->wrapBackendRenderTarget(desc));
     if (!rt) {
         return NULL;
     }
     SkAutoTUnref<SkGpuDevice> device(SkGpuDevice::Create(rt, props,
                                                          SkGpuDevice::kUninit_InitContents));
     if (!device) {
         return NULL;
     }
-    return SkNEW_ARGS(SkSurface_Gpu, (device));
+    return new SkSurface_Gpu(device);
 }
 
 #endif