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

src/gpu/GrContext.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrContext.h"
 
@@ skipping 46 matching lines @@
 #define RETURN_FALSE_IF_ABANDONED if (fDrawingMgr.abandoned()) { return false; }
 #define RETURN_NULL_IF_ABANDONED if (fDrawingMgr.abandoned()) { return NULL; }
 
 
 ////////////////////////////////////////////////////////////////////////////////
 
 void GrContext::DrawingMgr::init(GrContext* context) {
     fContext = context;
 
 #ifdef IMMEDIATE_MODE
-    fDrawTarget = SkNEW_ARGS(GrImmediateDrawTarget, (context));
+    fDrawTarget = new GrImmediateDrawTarget(context);
 #else
-    fDrawTarget = SkNEW_ARGS(GrBufferedDrawTarget, (context));
+    fDrawTarget = new GrBufferedDrawTarget(context);
 #endif    
 }
 
 void GrContext::DrawingMgr::cleanup() {
     SkSafeSetNull(fDrawTarget);
     for (int i = 0; i < kNumPixelGeometries; ++i) {
         SkSafeSetNull(fDrawContext[i][0]);
         SkSafeSetNull(fDrawContext[i][1]);
     }
 }
@@ skipping 35 matching lines @@
 GrDrawContext* GrContext::DrawingMgr::drawContext(const SkSurfaceProps* surfaceProps) { 
     if (this->abandoned()) {
         return NULL;
     }
 
     const SkSurfaceProps props(SkSurfacePropsCopyOrDefault(surfaceProps));
 
     SkASSERT(props.pixelGeometry() < kNumPixelGeometries);
     if (!fDrawContext[props.pixelGeometry()][props.isUseDistanceFieldFonts()]) {
         fDrawContext[props.pixelGeometry()][props.isUseDistanceFieldFonts()] =
-                SkNEW_ARGS(GrDrawContext, (fContext, fDrawTarget, props));
+                new GrDrawContext(fContext, fDrawTarget, props);
     }
 
     return fDrawContext[props.pixelGeometry()][props.isUseDistanceFieldFonts()]; 
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 
 
 GrContext* GrContext::Create(GrBackend backend, GrBackendContext backendContext) {
     GrContextOptions defaultOptions;
     return Create(backend, backendContext, defaultOptions);
 }
 
 GrContext* GrContext::Create(GrBackend backend, GrBackendContext backendContext,
                              const GrContextOptions& options) {
-    GrContext* context = SkNEW(GrContext);
+    GrContext* context = new GrContext;
 
     if (context->init(backend, backendContext, options)) {
         return context;
     } else {
         context->unref();
         return NULL;
     }
 }
 
 static int32_t gNextID = 1;
@@ skipping 23 matching lines @@
     fGpu = GrGpu::Create(backend, backendContext, options, this);
     if (!fGpu) {
         return false;
     }
     this->initCommon();
     return true;
 }
 
 void GrContext::initCommon() {
     fCaps = SkRef(fGpu->caps());
-    fResourceCache = SkNEW_ARGS(GrResourceCache, (fCaps));
+    fResourceCache = new GrResourceCache(fCaps);
     fResourceCache->setOverBudgetCallback(OverBudgetCB, this);
-    fResourceProvider = SkNEW_ARGS(GrResourceProvider, (fGpu, fResourceCache));
+    fResourceProvider = new GrResourceProvider(fGpu, fResourceCache);
 
-    fLayerCache.reset(SkNEW_ARGS(GrLayerCache, (this)));
+    fLayerCache.reset(new GrLayerCache(this));
 
     fDidTestPMConversions = false;
 
     fDrawingMgr.init(this);
 
     // GrBatchFontCache will eventually replace GrFontCache
-    fBatchFontCache = SkNEW_ARGS(GrBatchFontCache, (this));
+    fBatchFontCache = new GrBatchFontCache(this);
 
-    fTextBlobCache.reset(SkNEW_ARGS(GrTextBlobCache, (TextBlobCacheOverBudgetCB, this)));
+    fTextBlobCache.reset(new GrTextBlobCache(TextBlobCacheOverBudgetCB, this));
 }
 
 GrContext::~GrContext() {
     if (!fGpu) {
         SkASSERT(!fCaps);
         return;
     }
 
     this->flush();
 
     fDrawingMgr.cleanup();
 
     for (int i = 0; i < fCleanUpData.count(); ++i) {
         (*fCleanUpData[i].fFunc)(this, fCleanUpData[i].fInfo);
     }
 
-    SkDELETE(fResourceProvider);
-    SkDELETE(fResourceCache);
-    SkDELETE(fBatchFontCache);
+    delete fResourceProvider;
+    delete fResourceCache;
+    delete fBatchFontCache;
 
     fGpu->unref();
     fCaps->unref();
     SkSafeUnref(fPathRendererChain);
     SkSafeUnref(fSoftwarePathRenderer);
 }
 
 void GrContext::abandonContext() {
     fResourceProvider->abandon();
     // abandon first to so destructors
@@ skipping 410 matching lines @@
 GrPathRenderer* GrContext::getPathRenderer(const GrDrawTarget* target,
                                            const GrPipelineBuilder* pipelineBuilder,
                                            const SkMatrix& viewMatrix,
                                            const SkPath& path,
                                            const GrStrokeInfo& stroke,
                                            bool allowSW,
                                            GrPathRendererChain::DrawType drawType,
                                            GrPathRendererChain::StencilSupport* stencilSupport) {
 
     if (!fPathRendererChain) {
-        fPathRendererChain = SkNEW_ARGS(GrPathRendererChain, (this));
+        fPathRendererChain = new GrPathRendererChain(this);
     }
 
     GrPathRenderer* pr = fPathRendererChain->getPathRenderer(target,
                                                              pipelineBuilder,
                                                              viewMatrix,
                                                              path,
                                                              stroke,
                                                              drawType,
                                                              stencilSupport);
 
     if (!pr && allowSW) {
         if (!fSoftwarePathRenderer) {
-            fSoftwarePathRenderer = SkNEW_ARGS(GrSoftwarePathRenderer, (this));
+            fSoftwarePathRenderer = new GrSoftwarePathRenderer(this);
         }
         pr = fSoftwarePathRenderer;
     }
 
     return pr;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 int GrContext::getRecommendedSampleCount(GrPixelConfig config,
                                          SkScalar dpi) const {
@@ skipping 82 matching lines @@
 //////////////////////////////////////////////////////////////////////////////
 
 void GrContext::addGpuTraceMarker(const GrGpuTraceMarker* marker) {
     fGpu->addGpuTraceMarker(marker);
 }
 
 void GrContext::removeGpuTraceMarker(const GrGpuTraceMarker* marker) {
     fGpu->removeGpuTraceMarker(marker);
 }