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

src/ports/SkFontMgr_custom.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 "SkFontDescriptor.h"
 #include "SkFontHost_FreeType_common.h"
 #include "SkFontMgr.h"
@@ skipping 278 matching lines @@
     SkTypeface* onCreateFromStream(SkStreamAsset* bareStream, int ttcIndex) const override {
         SkAutoTDelete<SkStreamAsset> stream(bareStream);
         if (NULL == stream || stream->getLength() <= 0) {
             return NULL;
         }
 
         bool isFixedPitch;
         SkFontStyle style;
         SkString name;
         if (fScanner.scanFont(stream, ttcIndex, &name, &style, &isFixedPitch, NULL)) {
-            return SkNEW_ARGS(SkTypeface_Stream, (style, isFixedPitch, false, name,
-                                                  stream.detach(), ttcIndex));
+            return new SkTypeface_Stream(style, isFixedPitch, false, name, stream.detach(),
+                                         ttcIndex);
         } else {
             return NULL;
         }
     }
 
     SkTypeface* onCreateFromFile(const char path[], int ttcIndex) const override {
         SkAutoTDelete<SkStreamAsset> stream(SkStream::NewFromFile(path));
         return stream.get() ? this->createFromStream(stream.detach(), ttcIndex) : NULL;
     }
 
@@ skipping 35 matching lines @@
                          SkFontMgr_Custom::Families* families) const override
     {
         load_directory_fonts(scanner, fBaseDirectory, ".ttf", families);
         load_directory_fonts(scanner, fBaseDirectory, ".ttc", families);
         load_directory_fonts(scanner, fBaseDirectory, ".otf", families);
         load_directory_fonts(scanner, fBaseDirectory, ".pfb", families);
 
         if (families->empty()) {
             SkFontStyleSet_Custom* family = new SkFontStyleSet_Custom(SkString());
             families->push_back().reset(family);
-            family->appendTypeface(SkNEW(SkTypeface_Empty));
+            family->appendTypeface(new SkTypeface_Empty);
         }
     }
 
 private:
     static SkFontStyleSet_Custom* find_family(SkFontMgr_Custom::Families& families,
                                               const char familyName[])
     {
        for (int i = 0; i < families.count(); ++i) {
             if (families[i]->getFamilyName().equals(familyName)) {
                 return families[i].get();
@@ skipping 26 matching lines @@
             for (int faceIndex = 0; faceIndex < numFaces; ++faceIndex) {
                 bool isFixedPitch;
                 SkString realname;
                 SkFontStyle style = SkFontStyle(); // avoid uninitialized warning
                 if (!scanner.scanFont(stream, faceIndex, &realname, &style, &isFixedPitch, NULL)) {
                     SkDebugf("---- failed to open <%s> <%d> as a font\n",
                              filename.c_str(), faceIndex);
                     continue;
                 }
 
-                SkTypeface_Custom* tf = SkNEW_ARGS(SkTypeface_File, (
-                                                    style,
-                                                    isFixedPitch,
-                                                    true,  // system-font (cannot delete)
-                                                    realname,
-                                                    filename.c_str(),
-                                                    faceIndex));
+                SkTypeface_Custom* tf = new SkTypeface_File(style, isFixedPitch,
+                                                            true,  // system-font (cannot delete)
+                                                            realname, filename.c_str(), faceIndex);
 
                 SkFontStyleSet_Custom* addTo = find_family(*families, realname.c_str());
                 if (NULL == addTo) {
                     addTo = new SkFontStyleSet_Custom(realname);
                     families->push_back().reset(addTo);
                 }
                 addTo->appendTypeface(tf);
             }
         }
 
@@ skipping 27 matching lines @@
                          SkFontMgr_Custom::Families* families) const override
     {
         for (int i = 0; i < fHeader->count; ++i) {
             const SkEmbeddedResource& fontEntry = fHeader->entries[i];
             load_embedded_font(scanner, fontEntry.data, fontEntry.size, i, families);
         }
 
         if (families->empty()) {
             SkFontStyleSet_Custom* family = new SkFontStyleSet_Custom(SkString());
             families->push_back().reset(family);
-            family->appendTypeface(SkNEW(SkTypeface_Empty));
+            family->appendTypeface(new SkTypeface_Empty);
         }
     }
 
 private:
     static SkFontStyleSet_Custom* find_family(SkFontMgr_Custom::Families& families,
                                               const char familyName[])
     {
        for (int i = 0; i < families.count(); ++i) {
             if (families[i]->getFamilyName().equals(familyName)) {
                 return families[i].get();
@@ skipping 16 matching lines @@
 
         for (int faceIndex = 0; faceIndex < numFaces; ++faceIndex) {
             bool isFixedPitch;
             SkString realname;
             SkFontStyle style = SkFontStyle(); // avoid uninitialized warning
             if (!scanner.scanFont(stream, faceIndex, &realname, &style, &isFixedPitch, NULL)) {
                 SkDebugf("---- failed to open <%d> <%d> as a font\n", index, faceIndex);
                 return;
             }
 
-            SkTypeface_Custom* tf = SkNEW_ARGS(SkTypeface_Stream, (
-                                                style,
-                                                isFixedPitch,
-                                                true,  // system-font (cannot delete)
-                                                realname,
-                                                stream.detach(),
-                                                faceIndex));
+            SkTypeface_Custom* tf =
+                    new SkTypeface_Stream(style, isFixedPitch, true,  // system-font (cannot delete)
+                                          realname, stream.detach(), faceIndex);
 
             SkFontStyleSet_Custom* addTo = find_family(*families, realname.c_str());
             if (NULL == addTo) {
                 addTo = new SkFontStyleSet_Custom(realname);
                 families->push_back().reset(addTo);
             }
             addTo->appendTypeface(tf);
         }
     }
 
     const SkEmbeddedResourceHeader* fHeader;
 };
 
 SkFontMgr* SkFontMgr_New_Custom_Embedded(const SkEmbeddedResourceHeader* header) {
     return new SkFontMgr_Custom(EmbeddedSystemFontLoader(header));
 }