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

src/pdf/SkPDFTypes.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 "SkDeflate.h"
 #include "SkPDFTypes.h"
@@ skipping 20 matching lines @@
             SkSafeUnref(fObject);
             return;
         default:
             return;
     }
 }
 
 SkPDFUnion& SkPDFUnion::operator=(SkPDFUnion&& other) {
     if (this != &other) {
         this->~SkPDFUnion();
-        SkNEW_PLACEMENT_ARGS(this, SkPDFUnion, (other.move()));
+        new (this) SkPDFUnion(other.move());
     }
     return *this;
 }
 
 SkPDFUnion::SkPDFUnion(SkPDFUnion&& other) {
     SkASSERT(this != &other);
     memcpy(this, &other, sizeof(*this));
     other.fType = Type::kDestroyed;
 }
 
 #if 0
 SkPDFUnion SkPDFUnion::copy() const {
     SkPDFUnion u(fType);
     memcpy(&u, this, sizeof(u));
     switch (fType) {
         case Type::kNameSkS:
         case Type::kStringSkS:
-            SkNEW_PLACEMENT_ARGS(pun(u.fSkString), SkString,
-                                 (*pun(fSkString)));
+            new (pun(u.fSkString))  SkString                                   (*pun(fSkString));
             return u.move();
         case Type::kObjRef:
         case Type::kObject:
             SkRef(u.fObject);
             return u.move();
         default:
             return u.move();
     }
 }
 SkPDFUnion& SkPDFUnion::operator=(const SkPDFUnion& other) {
@@ skipping 148 matching lines @@
 
 SkPDFUnion SkPDFUnion::String(const char* value) {
     SkPDFUnion u(Type::kString);
     SkASSERT(value);
     u.fStaticString = value;
     return u.move();
 }
 
 SkPDFUnion SkPDFUnion::Name(const SkString& s) {
     SkPDFUnion u(Type::kNameSkS);
-    SkNEW_PLACEMENT_ARGS(pun(u.fSkString), SkString, (s));
+    new (pun(u.fSkString)) SkString(s);
     return u.move();
 }
 
 SkPDFUnion SkPDFUnion::String(const SkString& s) {
     SkPDFUnion u(Type::kStringSkS);
-    SkNEW_PLACEMENT_ARGS(pun(u.fSkString), SkString, (s));
+    new (pun(u.fSkString)) SkString(s);
     return u.move();
 }
 
 SkPDFUnion SkPDFUnion::ObjRef(SkPDFObject* ptr) {
     SkPDFUnion u(Type::kObjRef);
     SkASSERT(ptr);
     u.fObject = ptr;
     return u.move();
 }
 
@@ skipping 45 matching lines @@
     stream->writeText("]");
 }
 
 void SkPDFArray::addResources(SkPDFObjNumMap* catalog,
                               const SkPDFSubstituteMap& substitutes) const {
     for (const SkPDFUnion& value : fValues) {
         value.addResources(catalog, substitutes);
     }
 }
 
-void SkPDFArray::append(SkPDFUnion&& value) {
-    SkNEW_PLACEMENT_ARGS(fValues.append(), SkPDFUnion, (value.move()));
-}
+void SkPDFArray::append(SkPDFUnion&& value) { new (fValues.append()) SkPDFUnion(value.move()); }
 
 void SkPDFArray::appendInt(int32_t value) {
     this->append(SkPDFUnion::Int(value));
 }
 
 void SkPDFArray::appendBool(bool value) {
     this->append(SkPDFUnion::Bool(value));
 }
 
 void SkPDFArray::appendScalar(SkScalar value) {
@@ skipping 57 matching lines @@
                              const SkPDFSubstituteMap& substitutes) const {
     for (int i = 0; i < fRecords.count(); i++) {
         fRecords[i].fKey.addResources(catalog, substitutes);
         fRecords[i].fValue.addResources(catalog, substitutes);
     }
 }
 
 void SkPDFDict::set(SkPDFUnion&& name, SkPDFUnion&& value) {
     Record* rec = fRecords.append();
     SkASSERT(name.isName());
-    SkNEW_PLACEMENT_ARGS(&rec->fKey, SkPDFUnion, (name.move()));
-    SkNEW_PLACEMENT_ARGS(&rec->fValue, SkPDFUnion, (value.move()));
+    new (&rec->fKey) SkPDFUnion(name.move());
+    new (&rec->fValue) SkPDFUnion(value.move());
 }
 
 int SkPDFDict::size() const { return fRecords.count(); }
 
 void SkPDFDict::insertObjRef(const char key[], SkPDFObject* value) {
     this->set(SkPDFUnion::Name(key), SkPDFUnion::ObjRef(value));
 }
 void SkPDFDict::insertObjRef(const SkString& key, SkPDFObject* value) {
     this->set(SkPDFUnion::Name(key), SkPDFUnion::ObjRef(value));
 }
@@ skipping 109 matching lines @@
     fObjects.push(obj);
     return true;
 }
 
 int32_t SkPDFObjNumMap::getObjectNumber(SkPDFObject* obj) const {
     int32_t* objectNumberFound = fObjectNumbers.find(obj);
     SkASSERT(objectNumberFound);
     return *objectNumberFound;
 }