From 060ef18d5c02029eade04961f4cf62068d72a68e Mon Sep 17 00:00:00 2001 From: "tomhudson@google.com" Date: Tue, 24 Jul 2012 12:22:40 +0000 Subject: Replace new with SkNEW in more effects classes. http://codereview.appspot.com/6431052/ git-svn-id: http://skia.googlecode.com/svn/trunk@4727 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/effects/SkBitmapCache.cpp | 2 +- src/effects/SkGradientShader.cpp | 2 +- src/effects/SkLayerRasterizer.cpp | 6 +++--- src/effects/SkTableColorFilter.cpp | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/effects/SkBitmapCache.cpp b/src/effects/SkBitmapCache.cpp index f4b7b9149d..91f67ec23d 100644 --- a/src/effects/SkBitmapCache.cpp +++ b/src/effects/SkBitmapCache.cpp @@ -108,7 +108,7 @@ void SkBitmapCache::add(const void* buffer, size_t len, const SkBitmap& bm) { fEntryCount -= 1; } - Entry* entry = new Entry(buffer, len, bm); + Entry* entry = SkNEW_ARGS(Entry, (buffer, len, bm)); this->attachToHead(entry); fEntryCount += 1; } diff --git a/src/effects/SkGradientShader.cpp b/src/effects/SkGradientShader.cpp index 8838e77eb0..2b54bd138d 100644 --- a/src/effects/SkGradientShader.cpp +++ b/src/effects/SkGradientShader.cpp @@ -728,7 +728,7 @@ void Gradient_Shader::commonAsABitmap(SkBitmap* bitmap) const { SkAutoMutexAcquire ama(gMutex); if (NULL == gCache) { - gCache = new SkBitmapCache(MAX_NUM_CACHED_GRADIENT_BITMAPS); + gCache = SkNEW_ARGS(SkBitmapCache, (MAX_NUM_CACHED_GRADIENT_BITMAPS)); } size_t size = count * sizeof(int32_t); diff --git a/src/effects/SkLayerRasterizer.cpp b/src/effects/SkLayerRasterizer.cpp index f3de867291..dbcbefd030 100644 --- a/src/effects/SkLayerRasterizer.cpp +++ b/src/effects/SkLayerRasterizer.cpp @@ -40,7 +40,7 @@ void SkLayerRasterizer::addLayer(const SkPaint& paint, SkScalar dx, SkScalar dy) { SkLayerRasterizer_Rec* rec = (SkLayerRasterizer_Rec*)fLayers.push_back(); - new (&rec->fPaint) SkPaint(paint); + SkNEW_PLACEMENT_ARGS(&rec->fPaint, SkPaint, (paint)); rec->fOffset.set(dx, dy); } @@ -189,9 +189,9 @@ SkLayerRasterizer::SkLayerRasterizer(SkFlattenableReadBuffer& buffer) SkLayerRasterizer_Rec* rec = (SkLayerRasterizer_Rec*)fLayers.push_back(); #if 0 - new (&rec->fPaint) SkPaint(buffer); + SkNEW_PLACEMENT_ARGS(&rec->fPaint, SkPaint, (buffer)); #else - new (&rec->fPaint) SkPaint; + SkNEW_PLACEMENT(&rec->fPaint, SkPaint); paint_read(&rec->fPaint, buffer); #endif rec->fOffset.fX = buffer.readScalar(); diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index ab42031669..fb9aaa6ef4 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -179,7 +179,7 @@ SkTable_ColorFilter::SkTable_ColorFilter(SkFlattenableReadBuffer& buffer) : INHE bool SkTable_ColorFilter::asComponentTable(SkBitmap* table) { if (table) { if (NULL == fBitmap) { - fBitmap = new SkBitmap; + fBitmap = SkNEW(SkBitmap); fBitmap->setConfig(SkBitmap::kA8_Config, 256, 4, 256); fBitmap->allocPixels(); uint8_t* bitmapPixels = fBitmap->getAddr8(0, 0); -- cgit v1.2.3