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

src/ports/SkFontHost_FreeType.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkAdvancedTypefaceMetrics.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 140 matching lines @@
 // Private to RefFreeType and UnrefFreeType
 static int gFTCount;
 
 // Caller must lock gFTMutex before calling this function.
 static bool ref_ft_library() {
     gFTMutex.assertHeld();
     SkASSERT(gFTCount >= 0);
 
     if (0 == gFTCount) {
         SkASSERT(NULL == gFTLibrary);
-        gFTLibrary = SkNEW(FreeTypeLibrary);
+        gFTLibrary = new FreeTypeLibrary;
     }
     ++gFTCount;
     return gFTLibrary->library();
 }
 
 // Caller must lock gFTMutex before calling this function.
 static void unref_ft_library() {
     gFTMutex.assertHeld();
     SkASSERT(gFTCount > 0);
 
     --gFTCount;
     if (0 == gFTCount) {
         SkASSERT(NULL != gFTLibrary);
-        SkDELETE(gFTLibrary);
+        delete gFTLibrary;
         SkDEBUGCODE(gFTLibrary = NULL;)
     }
 }
 
 class SkScalerContext_FreeType : public SkScalerContext_FreeType_Base {
 public:
     SkScalerContext_FreeType(SkTypeface*, const SkDescriptor* desc);
     virtual ~SkScalerContext_FreeType();
 
     bool success() const {
@@ skipping 126 matching lines @@
         }
         rec = rec->fNext;
     }
 
     SkAutoTDelete<SkFontData> data(typeface->createFontData());
     if (NULL == data || !data->hasStream()) {
         return NULL;
     }
 
     // this passes ownership of stream to the rec
-    rec = SkNEW_ARGS(SkFaceRec, (data->detachStream(), fontID));
+    rec = new SkFaceRec(data->detachStream(), fontID);
 
     FT_Open_Args args;
     memset(&args, 0, sizeof(args));
     const void* memoryBase = rec->fSkStream->getMemoryBase();
     if (memoryBase) {
         args.flags = FT_OPEN_MEMORY;
         args.memory_base = (const FT_Byte*)memoryBase;
         args.memory_size = rec->fSkStream->getLength();
     } else {
         args.flags = FT_OPEN_STREAM;
         args.stream = &rec->fFTStream;
     }
 
     FT_Error err = FT_Open_Face(gFTLibrary->library(), &args, data->getIndex(), &rec->fFace);
     if (err) {
         SkDEBUGF(("ERROR: unable to open font '%x'\n", fontID));
-        SkDELETE(rec);
+        delete rec;
         return NULL;
     }
     SkASSERT(rec->fFace);
 
     ft_face_setup_axes(rec->fFace, *data);
 
     // FreeType will set the charmap to the "most unicode" cmap if it exists.
     // If there are no unicode cmaps, the charmap is set to NULL.
     // However, "symbol" cmaps should also be considered "fallback unicode" cmaps
     // because they are effectively private use area only (even if they aren't).
@@ skipping 17 matching lines @@
     while (rec) {
         SkFaceRec* next = rec->fNext;
         if (rec->fFace == face) {
             if (--rec->fRefCnt == 0) {
                 if (prev) {
                     prev->fNext = next;
                 } else {
                     gFaceRecHead = next;
                 }
                 FT_Done_Face(face);
-                SkDELETE(rec);
+                delete rec;
             }
             return;
         }
         prev = rec;
         rec = next;
     }
     SkDEBUGFAIL("shouldn't get here, face not in list");
 }
 
 class AutoFTAccess {
@@ skipping 267 matching lines @@
 
 // returns false if there is any non-90-rotation or skew
 static bool isAxisAligned(const SkScalerContext::Rec& rec) {
     return 0 == rec.fPreSkewX &&
            (bothZero(rec.fPost2x2[0][1], rec.fPost2x2[1][0]) ||
             bothZero(rec.fPost2x2[0][0], rec.fPost2x2[1][1]));
 }
 
 SkScalerContext* SkTypeface_FreeType::onCreateScalerContext(
                                                const SkDescriptor* desc) const {
-    SkScalerContext_FreeType* c = SkNEW_ARGS(SkScalerContext_FreeType,
-                                        (const_cast<SkTypeface_FreeType*>(this),
-                                         desc));
+    SkScalerContext_FreeType* c =
+            new SkScalerContext_FreeType(const_cast<SkTypeface_FreeType*>(this), desc);
     if (!c->success()) {
-        SkDELETE(c);
+        delete c;
         c = NULL;
     }
     return c;
 }
 
 void SkTypeface_FreeType::onFilterRec(SkScalerContextRec* rec) const {
     //BOGUS: http://code.google.com/p/chromium/issues/detail?id=121119
     //Cap the requested size as larger sizes give bogus values.
     //Remove when http://code.google.com/p/skia/issues/detail?id=554 is fixed.
     if (rec->fTextSize > SkIntToScalar(1 << 14)) {
@@ skipping 1052 matching lines @@
             (*axes)[i].fTag = ftAxis.tag;
             (*axes)[i].fMinimum = ftAxis.minimum;
             (*axes)[i].fDefault = ftAxis.def;
             (*axes)[i].fMaximum = ftAxis.maximum;
         }
     }
 
     FT_Done_Face(face);
     return true;
 }