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

src/ports/SkFontMgr_android.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkFixed.h"
 #include "SkFontDescriptor.h"
 #include "SkFontHost_FreeType_common.h"
@@ skipping 186 matching lines @@
                                       (axisDefinition.fTag      ) & 0xFF,
                                       SkFixedToDouble(axisSpecified.fValue),
                                       SkFixedToDouble(axisValues[i])));
                         }
                         break;
                     }
                 }
                 // TODO: warn on defaulted axis?
             }
 
-            SkDEBUGCODE (
-                // Check for axis specified, but not matched in font.
-                for (int i = 0; i < fontFile.fAxes.count(); ++i) {
-                    SkFourByteTag skTag = fontFile.fAxes[i].fTag;
-                    bool found = false;
-                    for (int j = 0; j < axisDefinitions.count(); ++j) {
-                        if (skTag == axisDefinitions[j].fTag) {
-                            found = true;
-                            break;
+            SkDEBUGCODE(
+                    // Check for axis specified, but not matched in font.
+                    for (int i = 0; i < fontFile.fAxes.count(); ++i) {
+                        SkFourByteTag skTag = fontFile.fAxes[i].fTag;
+                        bool found = false;
+                        for (int j = 0; j < axisDefinitions.count(); ++j) {
+                            if (skTag == axisDefinitions[j].fTag) {
+                                found = true;
+                                break;
+                            }
                         }
-                    }
-                    if (!found) {
-                        SkDEBUGF(("Requested font axis not found: %s '%c%c%c%c'\n",
-                                  familyName.c_str(),
-                                  (skTag >> 24) & 0xFF,
-                                  (skTag >> 16) & 0xFF,
-                                  (skTag >>  8) & 0xFF,
-                                  (skTag      ) & 0xFF));
-                    }
-                }
-            )
+                        if (!found) {
+                            SkDEBUGF(("Requested font axis not found: %s '%c%c%c%c'\n",
+                                      familyName.c_str(), (skTag >> 24) & 0xFF,
+                                      (skTag >> 16) & 0xFF, (skTag >> 8) & 0xFF, (skTag)&0xFF));
+                        }
+                    })
 
-            fStyles.push_back().reset(SkNEW_ARGS(SkTypeface_AndroidSystem,
-                                                 (pathName, ttcIndex,
-                                                  axisValues.get(), axisDefinitions.count(),
-                                                  style, isFixedWidth, familyName,
-                                                  lang, variant)));
+                    fStyles.push_back().reset(new SkTypeface_AndroidSystem(
+                            pathName, ttcIndex, axisValues.get(), axisDefinitions.count(), style,
+                            isFixedWidth, familyName, lang, variant));
         }
     }
 
     int count() override {
         return fStyles.count();
     }
     void getStyle(int index, SkFontStyle* style, SkString* name) override {
         if (index < 0 || fStyles.count() <= index) {
             return;
         }
@@ skipping 225 matching lines @@
 
     SkTypeface* onCreateFromStream(SkStreamAsset* bareStream, int ttcIndex) const override {
         SkAutoTDelete<SkStreamAsset> stream(bareStream);
         bool isFixedPitch;
         SkFontStyle style;
         SkString name;
         if (!fScanner.scanFont(stream, ttcIndex, &name, &style, &isFixedPitch, NULL)) {
             return NULL;
         }
         SkFontData* data(new SkFontData(stream.detach(), ttcIndex, NULL, 0));
-        return SkNEW_ARGS(SkTypeface_AndroidStream, (data, style, isFixedPitch, name));
+        return new SkTypeface_AndroidStream(data, style, isFixedPitch, name);
     }
 
     SkTypeface* onCreateFromFontData(SkFontData* data) const override {
         SkStreamAsset* stream(data->getStream());
         bool isFixedPitch;
         SkFontStyle style;
         SkString name;
         if (!fScanner.scanFont(stream, data->getIndex(), &name, &style, &isFixedPitch, NULL)) {
             return NULL;
         }
-        return SkNEW_ARGS(SkTypeface_AndroidStream, (data, style, isFixedPitch, name));
+        return new SkTypeface_AndroidStream(data, style, isFixedPitch, name);
     }
 
 
     virtual SkTypeface* onLegacyCreateTypeface(const char familyName[],
                                                unsigned styleBits) const override {
         SkFontStyle style = SkFontStyle(styleBits);
 
         if (familyName) {
             // On Android, we must return NULL when we can't find the requested
             // named typeface so that the system/app can provide their own recovery
@@ skipping 23 matching lines @@
             SkTDArray<NameToFamily>* nameToFamily = &fNameToFamilyMap;
             if (family.fIsFallbackFont) {
                 nameToFamily = &fFallbackNameToFamilyMap;
 
                 if (0 == family.fNames.count()) {
                     SkString& fallbackName = family.fNames.push_back();
                     fallbackName.printf("%.2x##fallback", i);
                 }
             }
 
-            SkFontStyleSet_Android* newSet =
-                SkNEW_ARGS(SkFontStyleSet_Android, (family, fScanner));
+            SkFontStyleSet_Android* newSet = new SkFontStyleSet_Android(family, fScanner);
             if (0 == newSet->count()) {
-                SkDELETE(newSet);
+                delete newSet;
                 continue;
             }
             fFontStyleSets.push_back().reset(newSet);
 
             for (int j = 0; j < family.fNames.count(); j++) {
                 NameToFamily* nextEntry = nameToFamily->append();
-                SkNEW_PLACEMENT_ARGS(&nextEntry->name, SkString, (family.fNames[j]));
+                new (&nextEntry->name) SkString(family.fNames[j]);
                 nextEntry->styleSet = newSet;
             }
         }
     }
 
     void findDefaultFont() {
         SkASSERT(!fFontStyleSets.empty());
 
         static const char* gDefaultNames[] = { "sans-serif" };
         for (size_t i = 0; i < SK_ARRAY_COUNT(gDefaultNames); ++i) {
@@ skipping 29 matching lines @@
     if (custom) {
         SkASSERT(0 <= custom->fSystemFontUse);
         SkASSERT(custom->fSystemFontUse < SK_ARRAY_COUNT(gSystemFontUseStrings));
         SkDEBUGF(("SystemFontUse: %s BasePath: %s Fonts: %s FallbackFonts: %s\n",
                   gSystemFontUseStrings[custom->fSystemFontUse],
                   custom->fBasePath,
                   custom->fFontsXml,
                   custom->fFallbackFontsXml));
     }
 
-    return SkNEW_ARGS(SkFontMgr_Android, (custom));
+    return new SkFontMgr_Android(custom);
 }