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

experimental/SimpleCocoaApp/SimpleApp.mm

+/*
+ * 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 "SkCanvas.h"
 #include "SkCGUtils.h"
 #include "SkGraphics.h"
 #include "SkImageDecoder.h"
 #include "SkOSFile.h"
 #include "SkPaint.h"
 #include "SkPicture.h"
 #include "SkStream.h"
 #include "SkWindow.h"
 
 static void make_filepath(SkString* path, const char* dir, const SkString& name) {
     size_t len = strlen(dir);
     path->set(dir);
     if (len > 0 && dir[len - 1] != '/') {
         path->append("/");
     }
     path->append(name);
 }
 
 static SkPicture* LoadPicture(const char path[]) {
     SkPicture* pic = NULL;
 
     SkBitmap bm;
     if (SkImageDecoder::DecodeFile(path, &bm)) {
         bm.setImmutable();
-        pic = SkNEW(SkPicture);
+        pic = new SkPicture;
         SkCanvas* can = pic->beginRecording(bm.width(), bm.height());
         can->drawBitmap(bm, 0, 0, NULL);
         pic->endRecording();
     } else {
         SkFILEStream stream(path);
         if (stream.isValid()) {
-            pic = SkNEW_ARGS(SkPicture,
-                             (&stream, NULL, &SkImageDecoder::DecodeStream));
+            pic = new SkPicture(&stream, NULL, &SkImageDecoder::DecodeStream);
         }
 
         if (false) { // re-record
             SkPicture p2;
             pic->draw(p2.beginRecording(pic->width(), pic->height()));
             p2.endRecording();
 
             SkString path2(path);
             path2.append(".new.skp");
             SkFILEWStream writer(path2.c_str());
@@ skipping 195 matching lines @@
     SkString filename;
     PathCanvas canvas;
     canvas.init();
     while (iter.next(&filename)) {
         SkString path;
      //   if (true) filename.set("tabl_www_sahadan_com.skp");
         make_filepath(&path, pictDir, filename);
         canvas.divName(filename, false);
         SkPicture* pic = LoadPicture(path.c_str());
         pic->draw(&canvas);
-        SkDELETE(pic);
+        delete pic;
     }
     SkDebugf("\n</div>\n\n");
 
     SkDebugf("<script type=\"text/javascript\">\n\n");
     SkDebugf("var testDivs = [\n");
 
     iter.reset(pictDir, "skp");
     while (iter.next(&filename)) {
         SkString path;
         make_filepath(&path, pictDir, filename);
         canvas.divName(filename, true);
         SkPicture* pic = LoadPicture(path.c_str());
         pic->draw(&canvas);
-        SkDELETE(pic);
+        delete pic;
     }
     SkDebugf("];\n\n");
 
     SkDebugf("points min=%d max=%d verbs min=%d max=%d\n", canvas.pointsMin, canvas.pointsMax,
             canvas.verbsMin, canvas.verbsMax);
     SkDebugf("rect points min=%d max=%d verbs min=%d max=%d\n", canvas.rectPointsMin, canvas.rectPointsMax,
             canvas.rectVerbsMin, canvas.rectVerbsMax);
 
     SkDebugf("\n");
 }
@@ skipping 22 matching lines @@
     }
     return self;
 }
 
 - (void)drawRect:(NSRect)dirtyRect {
     CGContextRef ctx = (CGContextRef)[[NSGraphicsContext currentContext] graphicsPort];
     SkCGDrawBitmap(ctx, fWind->getBitmap(), 0, 0);
 }
 
 @end