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

src/core/SkError.cpp

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkTLS.h"
 #include "SkTypes.h"
 #include "SkError.h"
 #include "SkErrorInternals.h"
 
 #include <stdio.h>
 #include <stdarg.h>
 
 namespace {
-    void *CreateThreadError() {
-        return SkNEW_ARGS(SkError, (kNoError_SkError));
-    }
-    void DeleteThreadError(void* v) {
-        SkDELETE(reinterpret_cast<SkError*>(v));
-    }
+void *CreateThreadError() { return new SkError(kNoError_SkError); }
+void DeleteThreadError(void *v) { delete reinterpret_cast<SkError *>(v); }
     #define THREAD_ERROR \
         (*reinterpret_cast<SkError*>(SkTLS::Get(CreateThreadError, DeleteThreadError)))
 
     void *CreateThreadErrorCallback() {
-        return SkNEW_ARGS(SkErrorCallbackFunction, (SkErrorInternals::DefaultErrorCallback));
+        return new SkErrorCallbackFunction(SkErrorInternals::DefaultErrorCallback);
     }
     void DeleteThreadErrorCallback(void* v) {
-        SkDELETE(reinterpret_cast<SkErrorCallbackFunction *>(v));
+        delete reinterpret_cast<SkErrorCallbackFunction *>(v);
     }
 
     #define THREAD_ERROR_CALLBACK                                                             \
         *(reinterpret_cast<SkErrorCallbackFunction *>(SkTLS::Get(CreateThreadErrorCallback,   \
                                                                  DeleteThreadErrorCallback)))
 
-    void *CreateThreadErrorContext() {
-        return SkNEW_ARGS(void **, (NULL));
-    }
-    void DeleteThreadErrorContext(void* v) {
-        SkDELETE(reinterpret_cast<void **>(v));
-    }
+    void *CreateThreadErrorContext() { return new void **(NULL); }
+    void DeleteThreadErrorContext(void *v) { delete reinterpret_cast<void **>(v); }
     #define THREAD_ERROR_CONTEXT \
         (*reinterpret_cast<void **>(SkTLS::Get(CreateThreadErrorContext, DeleteThreadErrorContext)))
 
     #define ERROR_STRING_LENGTH 2048
 
-    void *CreateThreadErrorString() {
-        return SkNEW_ARRAY(char, (ERROR_STRING_LENGTH));
-    }
-    void DeleteThreadErrorString(void* v) {
-        SkDELETE_ARRAY(reinterpret_cast<char *>(v));
-    }
+    void *CreateThreadErrorString() { return new char[(ERROR_STRING_LENGTH)]; }
+    void DeleteThreadErrorString(void *v) { delete[] reinterpret_cast<char *>(v); }
     #define THREAD_ERROR_STRING \
         (reinterpret_cast<char *>(SkTLS::Get(CreateThreadErrorString, DeleteThreadErrorString)))
 }
 
 SkError SkGetLastError() {
     return SkErrorInternals::GetLastError();
 }
 void SkClearLastError() {
     SkErrorInternals::ClearError();
 }
@@ skipping 69 matching lines @@
     str += strlen(str);
 
     va_start( args, fmt );
     vsnprintf( str, string_left, fmt, args );
     va_end( args );
     SkErrorCallbackFunction fn = THREAD_ERROR_CALLBACK;
     if (fn && code != kNoError_SkError) {
         fn(code, THREAD_ERROR_CONTEXT);
     }
 }