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

src/core/SkComposeShader.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 "SkComposeShader.h"
@@ skipping 42 matching lines @@
 };
 #define SkAutoAlphaRestore(...) SK_REQUIRE_LOCAL_VAR(SkAutoAlphaRestore)
 
 SkFlattenable* SkComposeShader::CreateProc(SkReadBuffer& buffer) {
     SkAutoTUnref<SkShader> shaderA(buffer.readShader());
     SkAutoTUnref<SkShader> shaderB(buffer.readShader());
     SkAutoTUnref<SkXfermode> mode(buffer.readXfermode());
     if (!shaderA.get() || !shaderB.get()) {
         return NULL;
     }
-    return SkNEW_ARGS(SkComposeShader, (shaderA, shaderB, mode));
+    return new SkComposeShader(shaderA, shaderB, mode);
 }
 
 void SkComposeShader::flatten(SkWriteBuffer& buffer) const {
     buffer.writeFlattenable(fShaderA);
     buffer.writeFlattenable(fShaderB);
     buffer.writeFlattenable(fMode);
 }
 
 template <typename T> void safe_call_destructor(T* obj) {
     if (obj) {
@@ skipping 21 matching lines @@
     newRec.fPaint = &opaquePaint;
 
     SkShader::Context* contextA = fShaderA->createContext(newRec, aStorage);
     SkShader::Context* contextB = fShaderB->createContext(newRec, bStorage);
     if (!contextA || !contextB) {
         safe_call_destructor(contextA);
         safe_call_destructor(contextB);
         return NULL;
     }
 
-    return SkNEW_PLACEMENT_ARGS(storage, ComposeShaderContext, (*this, rec, contextA, contextB));
+    return new (storage) ComposeShaderContext(*this, rec, contextA, contextB);
 }
 
 SkComposeShader::ComposeShaderContext::ComposeShaderContext(
         const SkComposeShader& shader, const ContextRec& rec,
         SkShader::Context* contextA, SkShader::Context* contextB)
     : INHERITED(shader, rec)
     , fShaderContextA(contextA)
     , fShaderContextB(contextB) {}
 
 SkComposeShader::ComposeShaderContext::~ComposeShaderContext() {
@@ skipping 89 matching lines @@
     if (fMode) {
         str->append(" Xfermode: ");
         fMode->toString(str);
     }
 
     this->INHERITED::toString(str);
 
     str->append(")");
 }
 #endif