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

include/core/SkLazyPtr.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkLazyPtr_DEFINED
 #define SkLazyPtr_DEFINED
 
 /** Declare a lazily-chosen static pointer (or array of pointers) of type T.
  *
  *  Example usage:
  *
  *  Foo* GetSingletonFoo() {
- *      SK_DECLARE_STATIC_LAZY_PTR(Foo, singleton);  // Created with SkNEW, destroyed with SkDELETE.
+ *      SK_DECLARE_STATIC_LAZY_PTR(Foo, singleton);  // Created with new, destroyed with delete.
  *      return singleton.get();
  *  }
  *
  *  These macros take an optional T* (*Create)() and void (*Destroy)(T*) at the end.
- *  If not given, we'll use SkNEW and SkDELETE.
+ *  If not given, we'll use new and delete.
  *  These options are most useful when T doesn't have a public constructor or destructor.
  *  Create comes first, so you may use a custom Create with a default Destroy, but not vice versa.
  *
  *  Foo* CustomCreate() { return ...; }
  *  void CustomDestroy(Foo* ptr) { ... }
  *  Foo* GetSingletonFooWithCustomCleanup() {
  *      SK_DECLARE_STATIC_LAZY_PTR(Foo, singleton, CustomCreate, CustomDestroy);
  *      return singleton.get();
  *  }
  *
@@ skipping 47 matching lines @@
         SkASSERT(!prev);
         return ptr;
     } else {
         Destroy(ptr);
         // We need an acquire barrier before returning prev.  The compare_exchange provided it.
         SkASSERT(prev);
         return prev;
     }
 }
 
-template <typename T> T* sk_new() { return SkNEW(T); }
-template <typename T> void sk_delete(T* ptr) { SkDELETE(ptr); }
+template <typename T>
+T* sk_new() {
+    return new T;
+}
+template <typename T>
+void sk_delete(T* ptr) {
+    delete ptr;
+}
 
 // We're basing these implementations here on this article:
 //   http://preshing.com/20140709/the-purpose-of-memory_order_consume-in-cpp11/
 //
 // Because the users of SkLazyPtr and SkLazyPtrArray will read the pointers
 // _through_ our atomically set pointer, there is a data dependency between our
 // atomic and the guarded data, and so we only need writer-releases /
 // reader-consumes memory pairing rather than the more general write-releases /
 // reader-acquires convention.
 //
@@ skipping 20 matching lines @@
         // If fPtr has already been filled, we need a consume barrier when loading it.
         // If not, we need a release barrier when setting it.  try_cas will do that.
         T* ptr = consume_load(&fPtr);
         return ptr ? ptr : try_cas<T*, Destroy>(&fPtr, Create());
     }
 
 private:
     T* fPtr;
 };
 
-template <typename T> T* sk_new_arg(int i) { return SkNEW_ARGS(T, (i)); }
+template <typename T>
+T* sk_new_arg(int i) {
+    return new T(i);
+}
 
 // This has no constructor and must be zero-initalized (the macro above does this).
 template <typename T, int N, T* (*Create)(int) = sk_new_arg<T>, void (*Destroy)(T*) = sk_delete<T> >
 class SkStaticLazyPtrArray {
 public:
     T* operator[](int i) {
         SkASSERT(i >= 0 && i < N);
         // If fPtr has already been filled, we need an consume barrier when loading it.
         // If not, we need a release barrier when setting it.  try_cas will do that.
         T* ptr = consume_load(&fArray[i]);
@@ skipping 13 matching lines @@
 //   - get() calls SkNew(T) to create the pointer;
 //   - get(functor) calls functor to create the pointer.
 template <typename T, void (*Destroy)(T*) = Private::sk_delete<T> >
 class SkLazyPtr : SkNoncopyable {
 public:
     SkLazyPtr() : fPtr(NULL) {}
     ~SkLazyPtr() { if (fPtr) { Destroy((T*)fPtr); } }
 
     T* get() const {
         T* ptr = Private::consume_load(&fPtr);
-        return ptr ? ptr : Private::try_cas<T*, Destroy>(&fPtr, SkNEW(T));
+        return ptr ? ptr : Private::try_cas<T*, Destroy>(&fPtr, new T);
     }
 
     template <typename Create>
     T* get(const Create& create) const {
         T* ptr = Private::consume_load(&fPtr);
         return ptr ? ptr : Private::try_cas<T*, Destroy>(&fPtr, create());
     }
 
 private:
     mutable T* fPtr;
 };
 
 
 #endif//SkLazyPtr_DEFINED