diff options
Diffstat (limited to 'src/effects')
32 files changed, 156 insertions, 218 deletions
diff --git a/src/effects/SkAlphaThresholdFilter.cpp b/src/effects/SkAlphaThresholdFilter.cpp index e55376d521..f6d146169a 100644 --- a/src/effects/SkAlphaThresholdFilter.cpp +++ b/src/effects/SkAlphaThresholdFilter.cpp @@ -43,7 +43,7 @@ SkImageFilter* SkAlphaThresholdFilter::Create(const SkRegion& region, SkScalar innerThreshold, SkScalar outerThreshold, SkImageFilter* input) { - return SkNEW_ARGS(SkAlphaThresholdFilterImpl, (region, innerThreshold, outerThreshold, input)); + return new SkAlphaThresholdFilterImpl(region, innerThreshold, outerThreshold, input); } #if SK_SUPPORT_GPU @@ -67,11 +67,8 @@ public: GrTexture* maskTexture, float innerThreshold, float outerThreshold) { - return SkNEW_ARGS(AlphaThresholdEffect, (procDataManager, - texture, - maskTexture, - innerThreshold, - outerThreshold)); + return new AlphaThresholdEffect(procDataManager, texture, maskTexture, innerThreshold, + outerThreshold); } virtual ~AlphaThresholdEffect() {}; @@ -215,7 +212,7 @@ void AlphaThresholdEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, } GrGLFragmentProcessor* AlphaThresholdEffect::onCreateGLInstance() const { - return SkNEW_ARGS(GrGLAlphaThresholdEffect, (*this)); + return new GrGLAlphaThresholdEffect(*this); } bool AlphaThresholdEffect::onIsEqual(const GrFragmentProcessor& sBase) const { diff --git a/src/effects/SkArithmeticMode.cpp b/src/effects/SkArithmeticMode.cpp index bd5bf461e6..b8959ddac5 100644 --- a/src/effects/SkArithmeticMode.cpp +++ b/src/effects/SkArithmeticMode.cpp @@ -21,7 +21,7 @@ class SkArithmeticMode_scalar : public SkXfermode { public: static SkArithmeticMode_scalar* Create(SkScalar k1, SkScalar k2, SkScalar k3, SkScalar k4, bool enforcePMColor) { - return SkNEW_ARGS(SkArithmeticMode_scalar, (k1, k2, k3, k4, enforcePMColor)); + return new SkArithmeticMode_scalar(k1, k2, k3, k4, enforcePMColor); } virtual void xfer32(SkPMColor dst[], const SkPMColor src[], int count, @@ -217,15 +217,15 @@ SkXfermode* SkArithmeticMode::Create(SkScalar k1, SkScalar k2, int32_t i3 = toDot8(k3); int32_t i4 = toDot8(k4); if (i1) { - return SkNEW_ARGS(SkArithmeticMode_quad, (i1, i2, i3, i4)); + return new SkArithmeticMode_quad (i1, i2, i3, i4); } if (0 == i2) { - return SkNEW_ARGS(SkArithmeticMode_dst, (i3, i4)); + return new SkArithmeticMode_dst (i3, i4); } if (0 == i3) { - return SkNEW_ARGS(SkArithmeticMode_src, (i2, i4)); + return new SkArithmeticMode_src (i2, i4); } - return SkNEW_ARGS(SkArithmeticMode_linear, (i2, i3, i4)); + return new SkArithmeticMode_linear (i2, i3, i4); #endif } return SkArithmeticMode_scalar::Create(k1, k2, k3, k4, enforcePMColor); diff --git a/src/effects/SkArithmeticMode_gpu.cpp b/src/effects/SkArithmeticMode_gpu.cpp index 39814e2eb2..279e36d3fb 100644 --- a/src/effects/SkArithmeticMode_gpu.cpp +++ b/src/effects/SkArithmeticMode_gpu.cpp @@ -118,7 +118,7 @@ void GrArithmeticFP::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyB } GrGLFragmentProcessor* GrArithmeticFP::onCreateGLInstance() const { - return SkNEW_ARGS(GLArithmeticFP, (*this)); + return new GLArithmeticFP(*this); } bool GrArithmeticFP::onIsEqual(const GrFragmentProcessor& fpBase) const { @@ -144,8 +144,7 @@ GrFragmentProcessor* GrArithmeticFP::TestCreate(GrProcessorTestData* d) { float k4 = d->fRandom->nextF(); bool enforcePMColor = d->fRandom->nextBool(); - return SkNEW_ARGS(GrArithmeticFP, (d->fProcDataManager, k1, k2, k3, k4, enforcePMColor, - d->fTextures[0])); + return new GrArithmeticFP(d->fProcDataManager, k1, k2, k3, k4, enforcePMColor, d->fTextures[0]); } GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrArithmeticFP); @@ -256,9 +255,7 @@ void ArithmeticXP::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBui GLArithmeticXP::GenKey(*this, caps, b); } -GrGLXferProcessor* ArithmeticXP::createGLInstance() const { - return SkNEW_ARGS(GLArithmeticXP, (*this)); -} +GrGLXferProcessor* ArithmeticXP::createGLInstance() const { return new GLArithmeticXP(*this); } GrXferProcessor::OptFlags ArithmeticXP::onGetOptimizations(const GrProcOptInfo& colorPOI, const GrProcOptInfo& coveragePOI, @@ -282,8 +279,7 @@ GrArithmeticXPFactory::onCreateXferProcessor(const GrCaps& caps, const GrProcOptInfo& coveragePOI, bool hasMixedSamples, const DstTexture* dstTexture) const { - return SkNEW_ARGS(ArithmeticXP, (dstTexture, hasMixedSamples, fK1, fK2, fK3, fK4, - fEnforcePMColor)); + return new ArithmeticXP(dstTexture, hasMixedSamples, fK1, fK2, fK3, fK4, fEnforcePMColor); } diff --git a/src/effects/SkArithmeticMode_gpu.h b/src/effects/SkArithmeticMode_gpu.h index 4f780cf71b..7b343ee35f 100644 --- a/src/effects/SkArithmeticMode_gpu.h +++ b/src/effects/SkArithmeticMode_gpu.h @@ -34,8 +34,7 @@ public: static GrFragmentProcessor* Create(GrProcessorDataManager* procDataManager, float k1, float k2, float k3, float k4, bool enforcePMColor, GrTexture* background) { - return SkNEW_ARGS(GrArithmeticFP, (procDataManager, k1, k2, k3, k4, enforcePMColor, - background)); + return new GrArithmeticFP(procDataManager, k1, k2, k3, k4, enforcePMColor, background); } ~GrArithmeticFP() override {}; @@ -76,7 +75,7 @@ private: class GrArithmeticXPFactory : public GrXPFactory { public: static GrXPFactory* Create(float k1, float k2, float k3, float k4, bool enforcePMColor) { - return SkNEW_ARGS(GrArithmeticXPFactory, (k1, k2, k3, k4, enforcePMColor)); + return new GrArithmeticXPFactory(k1, k2, k3, k4, enforcePMColor); } bool supportsRGBCoverage(GrColor knownColor, uint32_t knownColorFlags) const override { diff --git a/src/effects/SkBlurDrawLooper.cpp b/src/effects/SkBlurDrawLooper.cpp index b3094d6c45..ceb210d52d 100644 --- a/src/effects/SkBlurDrawLooper.cpp +++ b/src/effects/SkBlurDrawLooper.cpp @@ -103,7 +103,7 @@ bool SkBlurDrawLooper::asABlurShadow(BlurShadowRec* rec) const { //////////////////////////////////////////////////////////////////////////////////////// SkDrawLooper::Context* SkBlurDrawLooper::createContext(SkCanvas*, void* storage) const { - return SkNEW_PLACEMENT_ARGS(storage, BlurDrawLooperContext, (this)); + return new (storage) BlurDrawLooperContext(this); } SkBlurDrawLooper::BlurDrawLooperContext::BlurDrawLooperContext( diff --git a/src/effects/SkBlurMask.cpp b/src/effects/SkBlurMask.cpp index bf50845ab6..4d366fe9ff 100644 --- a/src/effects/SkBlurMask.cpp +++ b/src/effects/SkBlurMask.cpp @@ -682,7 +682,7 @@ void SkBlurMask::ComputeBlurProfile(SkScalar sigma, uint8_t **profile_out) { int size = SkScalarCeilToInt(6*sigma); int center = size >> 1; - uint8_t *profile = SkNEW_ARRAY(uint8_t, size); + uint8_t* profile = new uint8_t[size]; float invr = 1.f/(2*sigma); diff --git a/src/effects/SkBlurMaskFilter.cpp b/src/effects/SkBlurMaskFilter.cpp index 96789c2d35..852d29bc2b 100644 --- a/src/effects/SkBlurMaskFilter.cpp +++ b/src/effects/SkBlurMaskFilter.cpp @@ -133,7 +133,7 @@ SkMaskFilter* SkBlurMaskFilter::Create(SkBlurStyle style, SkScalar sigma, uint32 if (flags > SkBlurMaskFilter::kAll_BlurFlag) { return NULL; } - return SkNEW_ARGS(SkBlurMaskFilterImpl, (sigma, style, flags)); + return new SkBlurMaskFilterImpl(sigma, style, flags); } /////////////////////////////////////////////////////////////////////////////// @@ -632,7 +632,7 @@ public: if (!createdBlurProfileTexture) { return NULL; } - return SkNEW_ARGS(GrRectBlurEffect, (rect, sigma, blurProfileTexture)); + return new GrRectBlurEffect(rect, sigma, blurProfileTexture); } const SkRect& getRect() const { return fRect; } @@ -802,7 +802,7 @@ void GrRectBlurEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, } GrGLFragmentProcessor* GrRectBlurEffect::onCreateGLInstance() const { - return SkNEW_ARGS(GrGLRectBlurEffect, (*this)); + return new GrGLRectBlurEffect(*this); } bool GrRectBlurEffect::onIsEqual(const GrFragmentProcessor& sBase) const { @@ -972,7 +972,7 @@ GrFragmentProcessor* GrRRectBlurEffect::Create(GrTextureProvider* texProvider, f } texProvider->assignUniqueKeyToTexture(key, blurNinePatchTexture); } - return SkNEW_ARGS(GrRRectBlurEffect, (sigma, rrect, blurNinePatchTexture)); + return new GrRRectBlurEffect(sigma, rrect, blurNinePatchTexture); } void GrRRectBlurEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const { @@ -1102,7 +1102,7 @@ void GrRRectBlurEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorK } GrGLFragmentProcessor* GrRRectBlurEffect::onCreateGLInstance() const { - return SkNEW_ARGS(GrGLRRectBlurEffect, (*this)); + return new GrGLRRectBlurEffect(*this); } bool SkBlurMaskFilterImpl::directFilterRRectMaskGPU(GrTextureProvider* texProvider, diff --git a/src/effects/SkColorCubeFilter.cpp b/src/effects/SkColorCubeFilter.cpp index 5e9dfde2d4..d1857f991b 100644 --- a/src/effects/SkColorCubeFilter.cpp +++ b/src/effects/SkColorCubeFilter.cpp @@ -51,7 +51,7 @@ SkColorFilter* SkColorCubeFilter::Create(SkData* cubeData, int cubeDimension) { return NULL; } - return SkNEW_ARGS(SkColorCubeFilter, (cubeData, cubeDimension)); + return new SkColorCubeFilter(cubeData, cubeDimension); } SkColorCubeFilter::SkColorCubeFilter(SkData* cubeData, int cubeDimension) @@ -161,7 +161,7 @@ void SkColorCubeFilter::toString(SkString* str) const { class GrColorCubeEffect : public GrFragmentProcessor { public: static GrFragmentProcessor* Create(GrTexture* colorCube) { - return (NULL != colorCube) ? SkNEW_ARGS(GrColorCubeEffect, (colorCube)) : NULL; + return (NULL != colorCube) ? new GrColorCubeEffect(colorCube) : NULL; } virtual ~GrColorCubeEffect(); @@ -223,7 +223,7 @@ void GrColorCubeEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorK } GrGLFragmentProcessor* GrColorCubeEffect::onCreateGLInstance() const { - return SkNEW_ARGS(GLProcessor, (*this)); + return new GLProcessor(*this); } void GrColorCubeEffect::onComputeInvariantOutput(GrInvariantOutput* inout) const { diff --git a/src/effects/SkColorFilterImageFilter.cpp b/src/effects/SkColorFilterImageFilter.cpp index 94b530da8d..20dee8e639 100755..100644 --- a/src/effects/SkColorFilterImageFilter.cpp +++ b/src/effects/SkColorFilterImageFilter.cpp @@ -28,11 +28,11 @@ SkColorFilterImageFilter* SkColorFilterImageFilter::Create(SkColorFilter* cf, SkAutoUnref autoUnref(inputCF); SkAutoTUnref<SkColorFilter> newCF(SkColorFilter::CreateComposeFilter(cf, inputCF)); if (newCF) { - return SkNEW_ARGS(SkColorFilterImageFilter, (newCF, input->getInput(0), cropRect)); + return new SkColorFilterImageFilter(newCF, input->getInput(0), cropRect); } } - return SkNEW_ARGS(SkColorFilterImageFilter, (cf, input, cropRect)); + return new SkColorFilterImageFilter(cf, input, cropRect); } SkColorFilterImageFilter::SkColorFilterImageFilter(SkColorFilter* cf, diff --git a/src/effects/SkColorFilters.cpp b/src/effects/SkColorFilters.cpp index af3e38b02a..5560183153 100644 --- a/src/effects/SkColorFilters.cpp +++ b/src/effects/SkColorFilters.cpp @@ -134,7 +134,7 @@ public: // SkDebugf("Failing to create color filter for mode %d\n", mode); return NULL; } - return SkNEW_ARGS(ModeColorFilterEffect, (c, mode)); + return new ModeColorFilterEffect(c, mode); } bool willUseFilterColor() const { @@ -212,9 +212,7 @@ private: this->initClassID<ModeColorFilterEffect>(); } - GrGLFragmentProcessor* onCreateGLInstance() const override { - return SkNEW_ARGS(GLProcessor, (*this)); - } + GrGLFragmentProcessor* onCreateGLInstance() const override { return new GLProcessor(*this); } virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { @@ -438,11 +436,11 @@ SkColorFilter* SkColorFilter::CreateModeFilter(SkColor color, SkXfermode::Mode m switch (mode) { case SkXfermode::kSrc_Mode: - return SkNEW_ARGS(Src_SkModeColorFilter, (color)); + return new Src_SkModeColorFilter(color); case SkXfermode::kSrcOver_Mode: - return SkNEW_ARGS(SrcOver_SkModeColorFilter, (color)); + return new SrcOver_SkModeColorFilter(color); default: - return SkNEW_ARGS(SkModeColorFilter, (color, mode)); + return new SkModeColorFilter(color, mode); } } diff --git a/src/effects/SkColorMatrixFilter.cpp b/src/effects/SkColorMatrixFilter.cpp index 5845bc9ded..46c9b26298 100644 --- a/src/effects/SkColorMatrixFilter.cpp +++ b/src/effects/SkColorMatrixFilter.cpp @@ -389,7 +389,7 @@ SkColorFilter* SkColorMatrixFilter::newComposed(const SkColorFilter* innerFilter class ColorMatrixEffect : public GrFragmentProcessor { public: static GrFragmentProcessor* Create(const SkColorMatrix& matrix) { - return SkNEW_ARGS(ColorMatrixEffect, (matrix)); + return new ColorMatrixEffect(matrix); } const char* name() const override { return "Color Matrix"; } @@ -462,9 +462,7 @@ private: this->initClassID<ColorMatrixEffect>(); } - GrGLFragmentProcessor* onCreateGLInstance() const override { - return SkNEW_ARGS(GLProcessor, (*this)); - } + GrGLFragmentProcessor* onCreateGLInstance() const override { return new GLProcessor(*this); } virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp index f360fe102c..0c2cb8ac7e 100644 --- a/src/effects/SkDisplacementMapEffect.cpp +++ b/src/effects/SkDisplacementMapEffect.cpp @@ -173,8 +173,7 @@ SkDisplacementMapEffect* SkDisplacementMapEffect::Create(ChannelSelectorType xCh } SkImageFilter* inputs[2] = { displacement, color }; - return SkNEW_ARGS(SkDisplacementMapEffect, (xChannelSelector, yChannelSelector, scale, - inputs, cropRect)); + return new SkDisplacementMapEffect(xChannelSelector, yChannelSelector, scale, inputs, cropRect); } SkDisplacementMapEffect::SkDisplacementMapEffect(ChannelSelectorType xChannelSelector, @@ -334,14 +333,9 @@ public: SkDisplacementMapEffect::ChannelSelectorType yChannelSelector, SkVector scale, GrTexture* displacement, const SkMatrix& offsetMatrix, GrTexture* color, const SkISize& colorDimensions) { - return SkNEW_ARGS(GrDisplacementMapEffect, (procDataManager, - xChannelSelector, - yChannelSelector, - scale, - displacement, - offsetMatrix, - color, - colorDimensions)); + return new GrDisplacementMapEffect(procDataManager, xChannelSelector, yChannelSelector, + scale, displacement, offsetMatrix, color, + colorDimensions); } virtual ~GrDisplacementMapEffect(); @@ -357,7 +351,7 @@ public: private: GrGLFragmentProcessor* onCreateGLInstance() const override { - return SkNEW_ARGS(GrGLDisplacementMapEffect, (*this)); + return new GrGLDisplacementMapEffect(*this); } virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, diff --git a/src/effects/SkEmbossMaskFilter.cpp b/src/effects/SkEmbossMaskFilter.cpp index 59d297835e..fcb6a2a607 100644 --- a/src/effects/SkEmbossMaskFilter.cpp +++ b/src/effects/SkEmbossMaskFilter.cpp @@ -14,7 +14,7 @@ #include "SkString.h" SkEmbossMaskFilter* SkEmbossMaskFilter::Create(SkScalar blurSigma, const Light& light) { - return SkNEW_ARGS(SkEmbossMaskFilter, (blurSigma, light)); + return new SkEmbossMaskFilter(blurSigma, light); } static inline int pin2byte(int n) { diff --git a/src/effects/SkLayerDrawLooper.cpp b/src/effects/SkLayerDrawLooper.cpp index 30709c4f1c..622088ff73 100644 --- a/src/effects/SkLayerDrawLooper.cpp +++ b/src/effects/SkLayerDrawLooper.cpp @@ -31,14 +31,14 @@ SkLayerDrawLooper::~SkLayerDrawLooper() { Rec* rec = fRecs; while (rec) { Rec* next = rec->fNext; - SkDELETE(rec); + delete rec; rec = next; } } SkLayerDrawLooper::Context* SkLayerDrawLooper::createContext(SkCanvas* canvas, void* storage) const { canvas->save(); - return SkNEW_PLACEMENT_ARGS(storage, LayerDrawLooperContext, (this)); + return new (storage) LayerDrawLooperContext(this); } static SkColor xferColor(SkColor src, SkColor dst, SkXfermode::Mode mode) { @@ -302,7 +302,7 @@ SkLayerDrawLooper::Builder::~Builder() { Rec* rec = fRecs; while (rec) { Rec* next = rec->fNext; - SkDELETE(rec); + delete rec; rec = next; } } @@ -310,7 +310,7 @@ SkLayerDrawLooper::Builder::~Builder() { SkPaint* SkLayerDrawLooper::Builder::addLayer(const LayerInfo& info) { fCount += 1; - Rec* rec = SkNEW(Rec); + Rec* rec = new Rec; rec->fNext = fRecs; rec->fInfo = info; fRecs = rec; @@ -331,7 +331,7 @@ void SkLayerDrawLooper::Builder::addLayer(SkScalar dx, SkScalar dy) { SkPaint* SkLayerDrawLooper::Builder::addLayerOnTop(const LayerInfo& info) { fCount += 1; - Rec* rec = SkNEW(Rec); + Rec* rec = new Rec; rec->fNext = NULL; rec->fInfo = info; if (NULL == fRecs) { @@ -346,7 +346,7 @@ SkPaint* SkLayerDrawLooper::Builder::addLayerOnTop(const LayerInfo& info) { } SkLayerDrawLooper* SkLayerDrawLooper::Builder::detachLooper() { - SkLayerDrawLooper* looper = SkNEW(SkLayerDrawLooper); + SkLayerDrawLooper* looper = new SkLayerDrawLooper; looper->fCount = fCount; looper->fRecs = fRecs; diff --git a/src/effects/SkLayerRasterizer.cpp b/src/effects/SkLayerRasterizer.cpp index 8403d06147..d5ebb24a74 100644 --- a/src/effects/SkLayerRasterizer.cpp +++ b/src/effects/SkLayerRasterizer.cpp @@ -25,10 +25,7 @@ struct SkLayerRasterizer_Rec { SkVector fOffset; }; -SkLayerRasterizer::SkLayerRasterizer() - : fLayers(SkNEW_ARGS(SkDeque, (sizeof(SkLayerRasterizer_Rec)))) -{ -} +SkLayerRasterizer::SkLayerRasterizer() : fLayers(new SkDeque(sizeof(SkLayerRasterizer_Rec))) {} SkLayerRasterizer::SkLayerRasterizer(SkDeque* layers) : fLayers(layers) { @@ -42,7 +39,7 @@ static void clean_up_layers(SkDeque* layers) { while ((rec = (SkLayerRasterizer_Rec*)iter.next()) != NULL) rec->fPaint.~SkPaint(); - SkDELETE(layers); + delete layers; } SkLayerRasterizer::~SkLayerRasterizer() { @@ -149,17 +146,17 @@ bool SkLayerRasterizer::onRasterize(const SkPath& path, const SkMatrix& matrix, } SkFlattenable* SkLayerRasterizer::CreateProc(SkReadBuffer& buffer) { - return SkNEW_ARGS(SkLayerRasterizer, (ReadLayers(buffer))); + return new SkLayerRasterizer(ReadLayers(buffer)); } SkDeque* SkLayerRasterizer::ReadLayers(SkReadBuffer& buffer) { int count = buffer.readInt(); - SkDeque* layers = SkNEW_ARGS(SkDeque, (sizeof(SkLayerRasterizer_Rec))); + SkDeque* layers = new SkDeque(sizeof(SkLayerRasterizer_Rec)); for (int i = 0; i < count; i++) { SkLayerRasterizer_Rec* rec = (SkLayerRasterizer_Rec*)layers->push_back(); - SkNEW_PLACEMENT(&rec->fPaint, SkPaint); + new (&rec->fPaint) SkPaint; buffer.readPaint(&rec->fPaint); buffer.readPoint(&rec->fOffset); } @@ -181,10 +178,7 @@ void SkLayerRasterizer::flatten(SkWriteBuffer& buffer) const { } } -SkLayerRasterizer::Builder::Builder() - : fLayers(SkNEW_ARGS(SkDeque, (sizeof(SkLayerRasterizer_Rec)))) -{ -} +SkLayerRasterizer::Builder::Builder() : fLayers(new SkDeque(sizeof(SkLayerRasterizer_Rec))) {} SkLayerRasterizer::Builder::~Builder() { @@ -198,7 +192,7 @@ void SkLayerRasterizer::Builder::addLayer(const SkPaint& paint, SkScalar dx, SkASSERT(fLayers); SkLayerRasterizer_Rec* rec = (SkLayerRasterizer_Rec*)fLayers->push_back(); - SkNEW_PLACEMENT_ARGS(&rec->fPaint, SkPaint, (paint)); + new (&rec->fPaint) SkPaint(paint); rec->fOffset.set(dx, dy); } @@ -206,9 +200,9 @@ SkLayerRasterizer* SkLayerRasterizer::Builder::detachRasterizer() { SkLayerRasterizer* rasterizer; if (0 == fLayers->count()) { rasterizer = NULL; - SkDELETE(fLayers); + delete fLayers; } else { - rasterizer = SkNEW_ARGS(SkLayerRasterizer, (fLayers)); + rasterizer = new SkLayerRasterizer(fLayers); } fLayers = NULL; return rasterizer; @@ -218,18 +212,18 @@ SkLayerRasterizer* SkLayerRasterizer::Builder::snapshotRasterizer() const { if (0 == fLayers->count()) { return NULL; } - SkDeque* layers = SkNEW_ARGS(SkDeque, (sizeof(SkLayerRasterizer_Rec), fLayers->count())); + SkDeque* layers = new SkDeque(sizeof(SkLayerRasterizer_Rec), fLayers->count()); SkDeque::F2BIter iter(*fLayers); const SkLayerRasterizer_Rec* recOrig; SkDEBUGCODE(int count = 0;) while ((recOrig = static_cast<SkLayerRasterizer_Rec*>(iter.next())) != NULL) { SkDEBUGCODE(count++); SkLayerRasterizer_Rec* recCopy = static_cast<SkLayerRasterizer_Rec*>(layers->push_back()); - SkNEW_PLACEMENT_ARGS(&recCopy->fPaint, SkPaint, (recOrig->fPaint)); + new (&recCopy->fPaint) SkPaint(recOrig->fPaint); recCopy->fOffset = recOrig->fOffset; } SkASSERT(fLayers->count() == count); SkASSERT(layers->count() == count); - SkLayerRasterizer* rasterizer = SkNEW_ARGS(SkLayerRasterizer, (layers)); + SkLayerRasterizer* rasterizer = new SkLayerRasterizer(layers); return rasterizer; } diff --git a/src/effects/SkLerpXfermode.cpp b/src/effects/SkLerpXfermode.cpp index 76c97ef9ac..a9b0d9e3e7 100644 --- a/src/effects/SkLerpXfermode.cpp +++ b/src/effects/SkLerpXfermode.cpp @@ -18,7 +18,7 @@ SkXfermode* SkLerpXfermode::Create(SkScalar scale) { } else if (scale256 <= 0) { return SkXfermode::Create(SkXfermode::kDst_Mode); } - return SkNEW_ARGS(SkLerpXfermode, (scale256)); + return new SkLerpXfermode(scale256); } SkLerpXfermode::SkLerpXfermode(unsigned scale256) : fScale256(scale256) {} @@ -28,7 +28,7 @@ void SkLerpXfermode::flatten(SkWriteBuffer& buffer) const { } SkFlattenable* SkLerpXfermode::CreateProc(SkReadBuffer& buffer) { - return SkNEW_ARGS(SkLerpXfermode, (buffer.readUInt())); + return new SkLerpXfermode(buffer.readUInt()); } void SkLerpXfermode::xfer32(SkPMColor dst[], const SkPMColor src[], int count, diff --git a/src/effects/SkLightingImageFilter.cpp b/src/effects/SkLightingImageFilter.cpp index c63b2ebe50..2e25cbf502 100644 --- a/src/effects/SkLightingImageFilter.cpp +++ b/src/effects/SkLightingImageFilter.cpp @@ -527,13 +527,8 @@ public: const SkMatrix& matrix, SkScalar kd, BoundaryMode boundaryMode) { - return SkNEW_ARGS(GrDiffuseLightingEffect, (procDataManager, - texture, - light, - surfaceScale, - matrix, - kd, - boundaryMode)); + return new GrDiffuseLightingEffect(procDataManager, texture, light, surfaceScale, matrix, + kd, boundaryMode); } const char* name() const override { return "DiffuseLighting"; } @@ -570,14 +565,8 @@ public: SkScalar ks, SkScalar shininess, BoundaryMode boundaryMode) { - return SkNEW_ARGS(GrSpecularLightingEffect, (procDataManager, - texture, - light, - surfaceScale, - matrix, - ks, - shininess, - boundaryMode)); + return new GrSpecularLightingEffect(procDataManager, texture, light, surfaceScale, matrix, + ks, shininess, boundaryMode); } const char* name() const override { return "SpecularLighting"; } @@ -762,7 +751,7 @@ public: const SkPoint3& direction() const { return fDirection; } GrGLLight* createGLLight() const override { #if SK_SUPPORT_GPU - return SkNEW(GrGLDistantLight); + return new GrGLDistantLight; #else SkDEBUGFAIL("Should not call in GPU-less build"); return NULL; @@ -821,7 +810,7 @@ public: const SkPoint3& location() const { return fLocation; } GrGLLight* createGLLight() const override { #if SK_SUPPORT_GPU - return SkNEW(GrGLPointLight); + return new GrGLPointLight; #else SkDEBUGFAIL("Should not call in GPU-less build"); return NULL; @@ -935,7 +924,7 @@ public: } GrGLLight* createGLLight() const override { #if SK_SUPPORT_GPU - return SkNEW(GrGLSpotLight); + return new GrGLSpotLight; #else SkDEBUGFAIL("Should not call in GPU-less build"); return NULL; @@ -1041,9 +1030,12 @@ void SkImageFilterLight::flattenLight(SkWriteBuffer& buffer) const { switch (type) { // Each of these constructors must first call SkLight's, so we'll read the baseclass // then subclass, same order as flattenLight. - case SkImageFilterLight::kDistant_LightType: return SkNEW_ARGS(SkDistantLight, (buffer)); - case SkImageFilterLight::kPoint_LightType: return SkNEW_ARGS(SkPointLight, (buffer)); - case SkImageFilterLight::kSpot_LightType: return SkNEW_ARGS(SkSpotLight, (buffer)); + case SkImageFilterLight::kDistant_LightType: + return new SkDistantLight(buffer); + case SkImageFilterLight::kPoint_LightType: + return new SkPointLight(buffer); + case SkImageFilterLight::kSpot_LightType: + return new SkSpotLight(buffer); default: SkDEBUGFAIL("Unknown LightType."); buffer.validate(false); @@ -1065,7 +1057,7 @@ SkImageFilter* SkLightingImageFilter::CreateDistantLitDiffuse(const SkPoint3& di SkScalar kd, SkImageFilter* input, const CropRect* cropRect) { - SkAutoTUnref<SkImageFilterLight> light(SkNEW_ARGS(SkDistantLight, (direction, lightColor))); + SkAutoTUnref<SkImageFilterLight> light(new SkDistantLight(direction, lightColor)); return SkDiffuseLightingImageFilter::Create(light, surfaceScale, kd, input, cropRect); } @@ -1075,7 +1067,7 @@ SkImageFilter* SkLightingImageFilter::CreatePointLitDiffuse(const SkPoint3& loca SkScalar kd, SkImageFilter* input, const CropRect* cropRect) { - SkAutoTUnref<SkImageFilterLight> light(SkNEW_ARGS(SkPointLight, (location, lightColor))); + SkAutoTUnref<SkImageFilterLight> light(new SkPointLight(location, lightColor)); return SkDiffuseLightingImageFilter::Create(light, surfaceScale, kd, input, cropRect); } @@ -1088,9 +1080,8 @@ SkImageFilter* SkLightingImageFilter::CreateSpotLitDiffuse(const SkPoint3& locat SkScalar kd, SkImageFilter* input, const CropRect* cropRect) { - SkAutoTUnref<SkImageFilterLight> light(SkNEW_ARGS(SkSpotLight, (location, target, - specularExponent, - cutoffAngle, lightColor))); + SkAutoTUnref<SkImageFilterLight> light( + new SkSpotLight(location, target, specularExponent, cutoffAngle, lightColor)); return SkDiffuseLightingImageFilter::Create(light, surfaceScale, kd, input, cropRect); } @@ -1101,7 +1092,7 @@ SkImageFilter* SkLightingImageFilter::CreateDistantLitSpecular(const SkPoint3& d SkScalar shine, SkImageFilter* input, const CropRect* cropRect) { - SkAutoTUnref<SkImageFilterLight> light(SkNEW_ARGS(SkDistantLight, (direction, lightColor))); + SkAutoTUnref<SkImageFilterLight> light(new SkDistantLight(direction, lightColor)); return SkSpecularLightingImageFilter::Create(light, surfaceScale, ks, shine, input, cropRect); } @@ -1112,7 +1103,7 @@ SkImageFilter* SkLightingImageFilter::CreatePointLitSpecular(const SkPoint3& loc SkScalar shine, SkImageFilter* input, const CropRect* cropRect) { - SkAutoTUnref<SkImageFilterLight> light(SkNEW_ARGS(SkPointLight, (location, lightColor))); + SkAutoTUnref<SkImageFilterLight> light(new SkPointLight(location, lightColor)); return SkSpecularLightingImageFilter::Create(light, surfaceScale, ks, shine, input, cropRect); } @@ -1126,9 +1117,8 @@ SkImageFilter* SkLightingImageFilter::CreateSpotLitSpecular(const SkPoint3& loca SkScalar shine, SkImageFilter* input, const CropRect* cropRect) { - SkAutoTUnref<SkImageFilterLight> light(SkNEW_ARGS(SkSpotLight, (location, target, - specularExponent, - cutoffAngle, lightColor))); + SkAutoTUnref<SkImageFilterLight> light( + new SkSpotLight(location, target, specularExponent, cutoffAngle, lightColor)); return SkSpecularLightingImageFilter::Create(light, surfaceScale, ks, shine, input, cropRect); } @@ -1158,7 +1148,7 @@ SkImageFilter* SkDiffuseLightingImageFilter::Create(SkImageFilterLight* light, if (kd < 0) { return NULL; } - return SkNEW_ARGS(SkDiffuseLightingImageFilter, (light, surfaceScale, kd, input, cropRect)); + return new SkDiffuseLightingImageFilter(light, surfaceScale, kd, input, cropRect); } SkDiffuseLightingImageFilter::SkDiffuseLightingImageFilter(SkImageFilterLight* light, @@ -1294,8 +1284,7 @@ SkImageFilter* SkSpecularLightingImageFilter::Create(SkImageFilterLight* light, if (ks < 0) { return NULL; } - return SkNEW_ARGS(SkSpecularLightingImageFilter, - (light, surfaceScale, ks, shininess, input, cropRect)); + return new SkSpecularLightingImageFilter(light, surfaceScale, ks, shininess, input, cropRect); } SkSpecularLightingImageFilter::SkSpecularLightingImageFilter(SkImageFilterLight* light, @@ -1429,17 +1418,14 @@ SkImageFilterLight* create_random_light(SkRandom* random) { int type = random->nextULessThan(3); switch (type) { case 0: { - return SkNEW_ARGS(SkDistantLight, (random_point3(random), random->nextU())); + return new SkDistantLight(random_point3(random), random->nextU()); } case 1: { - return SkNEW_ARGS(SkPointLight, (random_point3(random), random->nextU())); + return new SkPointLight(random_point3(random), random->nextU()); } case 2: { - return SkNEW_ARGS(SkSpotLight, (random_point3(random), - random_point3(random), - random->nextUScalar1(), - random->nextUScalar1(), - random->nextU())); + return new SkSpotLight(random_point3(random), random_point3(random), + random->nextUScalar1(), random->nextUScalar1(), random->nextU()); } default: SkFAIL("Unexpected value."); @@ -1638,7 +1624,7 @@ void GrDiffuseLightingEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, } GrGLFragmentProcessor* GrDiffuseLightingEffect::onCreateGLInstance() const { - return SkNEW_ARGS(GrGLDiffuseLightingEffect, (*this)); + return new GrGLDiffuseLightingEffect(*this); } GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrDiffuseLightingEffect); @@ -1841,7 +1827,7 @@ void GrSpecularLightingEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, } GrGLFragmentProcessor* GrSpecularLightingEffect::onCreateGLInstance() const { - return SkNEW_ARGS(GrGLSpecularLightingEffect, (*this)); + return new GrGLSpecularLightingEffect(*this); } GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrSpecularLightingEffect); diff --git a/src/effects/SkLumaColorFilter.cpp b/src/effects/SkLumaColorFilter.cpp index 8d5181a4f5..caa2a208d2 100644 --- a/src/effects/SkLumaColorFilter.cpp +++ b/src/effects/SkLumaColorFilter.cpp @@ -37,15 +37,11 @@ void SkLumaColorFilter::filterSpan(const SkPMColor src[], int count, } } -SkColorFilter* SkLumaColorFilter::Create() { - return SkNEW(SkLumaColorFilter); -} +SkColorFilter* SkLumaColorFilter::Create() { return new SkLumaColorFilter; } SkLumaColorFilter::SkLumaColorFilter() : INHERITED() {} -SkFlattenable* SkLumaColorFilter::CreateProc(SkReadBuffer&) { - return SkNEW(SkLumaColorFilter); -} +SkFlattenable* SkLumaColorFilter::CreateProc(SkReadBuffer&) { return new SkLumaColorFilter; } void SkLumaColorFilter::flatten(SkWriteBuffer&) const {} @@ -96,9 +92,7 @@ private: this->initClassID<LumaColorFilterEffect>(); } - GrGLFragmentProcessor* onCreateGLInstance() const override { - return SkNEW_ARGS(GLProcessor, (*this)); - } + GrGLFragmentProcessor* onCreateGLInstance() const override { return new GLProcessor(*this); } virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessorKeyBuilder* b) const override { diff --git a/src/effects/SkMagnifierImageFilter.cpp b/src/effects/SkMagnifierImageFilter.cpp index baa1926f7c..8bebd20aa9 100644 --- a/src/effects/SkMagnifierImageFilter.cpp +++ b/src/effects/SkMagnifierImageFilter.cpp @@ -32,15 +32,8 @@ public: float yInvZoom, float xInvInset, float yInvInset) { - return SkNEW_ARGS(GrMagnifierEffect, (procDataManager, - texture, - bounds, - xOffset, - yOffset, - xInvZoom, - yInvZoom, - xInvInset, - yInvInset)); + return new GrMagnifierEffect(procDataManager, texture, bounds, xOffset, yOffset, xInvZoom, + yInvZoom, xInvInset, yInvInset); } virtual ~GrMagnifierEffect() {}; @@ -197,7 +190,7 @@ void GrMagnifierEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, } GrGLFragmentProcessor* GrMagnifierEffect::onCreateGLInstance() const { - return SkNEW_ARGS(GrGLMagnifierEffect, (*this)); + return new GrGLMagnifierEffect(*this); } GR_DEFINE_FRAGMENT_PROCESSOR_TEST(GrMagnifierEffect); @@ -258,7 +251,7 @@ SkImageFilter* SkMagnifierImageFilter::Create(const SkRect& srcRect, SkScalar in if (srcRect.fLeft < 0 || srcRect.fTop < 0) { return NULL; } - return SkNEW_ARGS(SkMagnifierImageFilter, (srcRect, inset, input)); + return new SkMagnifierImageFilter(srcRect, inset, input); } diff --git a/src/effects/SkMatrixConvolutionImageFilter.cpp b/src/effects/SkMatrixConvolutionImageFilter.cpp index 92ac934559..1c44fed4e2 100644 --- a/src/effects/SkMatrixConvolutionImageFilter.cpp +++ b/src/effects/SkMatrixConvolutionImageFilter.cpp @@ -39,7 +39,7 @@ SkMatrixConvolutionImageFilter::SkMatrixConvolutionImageFilter( fTileMode(tileMode), fConvolveAlpha(convolveAlpha) { size_t size = (size_t) sk_64_mul(fKernelSize.width(), fKernelSize.height()); - fKernel = SkNEW_ARRAY(SkScalar, size); + fKernel = new SkScalar[size]; memcpy(fKernel, kernel, size * sizeof(SkScalar)); SkASSERT(kernelSize.fWidth >= 1 && kernelSize.fHeight >= 1); SkASSERT(kernelOffset.fX >= 0 && kernelOffset.fX < kernelSize.fWidth); @@ -69,9 +69,8 @@ SkMatrixConvolutionImageFilter* SkMatrixConvolutionImageFilter::Create( (kernelOffset.fY < 0) || (kernelOffset.fY >= kernelSize.fHeight)) { return NULL; } - return SkNEW_ARGS(SkMatrixConvolutionImageFilter, (kernelSize, kernel, gain, bias, - kernelOffset, tileMode, convolveAlpha, - input, cropRect)); + return new SkMatrixConvolutionImageFilter(kernelSize, kernel, gain, bias, kernelOffset, + tileMode, convolveAlpha, input, cropRect); } SkFlattenable* SkMatrixConvolutionImageFilter::CreateProc(SkReadBuffer& buffer) { diff --git a/src/effects/SkMorphologyImageFilter.cpp b/src/effects/SkMorphologyImageFilter.cpp index 01e978e846..7d6bfff944 100644 --- a/src/effects/SkMorphologyImageFilter.cpp +++ b/src/effects/SkMorphologyImageFilter.cpp @@ -207,13 +207,13 @@ public: static GrFragmentProcessor* Create(GrProcessorDataManager* procDataManager, GrTexture* tex, Direction dir, int radius, MorphologyType type) { - return SkNEW_ARGS(GrMorphologyEffect, (procDataManager, tex, dir, radius, type)); + return new GrMorphologyEffect(procDataManager, tex, dir, radius, type); } static GrFragmentProcessor* Create(GrProcessorDataManager* procDataManager, GrTexture* tex, Direction dir, int radius, MorphologyType type, float bounds[2]) { - return SkNEW_ARGS(GrMorphologyEffect, (procDataManager, tex, dir, radius, type, bounds)); + return new GrMorphologyEffect(procDataManager, tex, dir, radius, type, bounds); } virtual ~GrMorphologyEffect(); @@ -425,7 +425,7 @@ void GrMorphologyEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, GrProcessor } GrGLFragmentProcessor* GrMorphologyEffect::onCreateGLInstance() const { - return SkNEW_ARGS(GrGLMorphologyEffect, (*this)); + return new GrGLMorphologyEffect(*this); } bool GrMorphologyEffect::onIsEqual(const GrFragmentProcessor& sBase) const { const GrMorphologyEffect& s = sBase.cast<GrMorphologyEffect>(); diff --git a/src/effects/SkPerlinNoiseShader.cpp b/src/effects/SkPerlinNoiseShader.cpp index 501e6361a5..2ca86c70f5 100644 --- a/src/effects/SkPerlinNoiseShader.cpp +++ b/src/effects/SkPerlinNoiseShader.cpp @@ -250,15 +250,15 @@ public: SkShader* SkPerlinNoiseShader::CreateFractalNoise(SkScalar baseFrequencyX, SkScalar baseFrequencyY, int numOctaves, SkScalar seed, const SkISize* tileSize) { - return SkNEW_ARGS(SkPerlinNoiseShader, (kFractalNoise_Type, baseFrequencyX, baseFrequencyY, - numOctaves, seed, tileSize)); + return new SkPerlinNoiseShader(kFractalNoise_Type, baseFrequencyX, baseFrequencyY, numOctaves, + seed, tileSize); } SkShader* SkPerlinNoiseShader::CreateTurbulence(SkScalar baseFrequencyX, SkScalar baseFrequencyY, int numOctaves, SkScalar seed, const SkISize* tileSize) { - return SkNEW_ARGS(SkPerlinNoiseShader, (kTurbulence_Type, baseFrequencyX, baseFrequencyY, - numOctaves, seed, tileSize)); + return new SkPerlinNoiseShader(kTurbulence_Type, baseFrequencyX, baseFrequencyY, numOctaves, + seed, tileSize); } SkPerlinNoiseShader::SkPerlinNoiseShader(SkPerlinNoiseShader::Type type, @@ -429,7 +429,7 @@ SkPMColor SkPerlinNoiseShader::PerlinNoiseShaderContext::shade( SkShader::Context* SkPerlinNoiseShader::onCreateContext(const ContextRec& rec, void* storage) const { - return SkNEW_PLACEMENT_ARGS(storage, PerlinNoiseShaderContext, (*this, rec)); + return new (storage) PerlinNoiseShaderContext(*this, rec); } size_t SkPerlinNoiseShader::contextSize() const { @@ -448,12 +448,11 @@ SkPerlinNoiseShader::PerlinNoiseShaderContext::PerlinNoiseShaderContext( // This (1,1) translation is due to WebKit's 1 based coordinates for the noise // (as opposed to 0 based, usually). The same adjustment is in the setData() function. fMatrix.setTranslate(-newMatrix.getTranslateX() + SK_Scalar1, -newMatrix.getTranslateY() + SK_Scalar1); - fPaintingData = SkNEW_ARGS(PaintingData, (shader.fTileSize, shader.fSeed, shader.fBaseFrequencyX, shader.fBaseFrequencyY, newMatrix)); + fPaintingData = new PaintingData(shader.fTileSize, shader.fSeed, shader.fBaseFrequencyX, + shader.fBaseFrequencyY, newMatrix); } -SkPerlinNoiseShader::PerlinNoiseShaderContext::~PerlinNoiseShaderContext() { - SkDELETE(fPaintingData); -} +SkPerlinNoiseShader::PerlinNoiseShaderContext::~PerlinNoiseShaderContext() { delete fPaintingData; } void SkPerlinNoiseShader::PerlinNoiseShaderContext::shadeSpan( int x, int y, SkPMColor result[], int count) { @@ -517,14 +516,11 @@ public: SkPerlinNoiseShader::PaintingData* paintingData, GrTexture* permutationsTexture, GrTexture* noiseTexture, const SkMatrix& matrix, uint8_t alpha) { - return SkNEW_ARGS(GrPerlinNoiseEffect, (procDataManager, type, numOctaves, stitchTiles, - paintingData, permutationsTexture, noiseTexture, - matrix, alpha)); + return new GrPerlinNoiseEffect(procDataManager, type, numOctaves, stitchTiles, paintingData, + permutationsTexture, noiseTexture, matrix, alpha); } - virtual ~GrPerlinNoiseEffect() { - SkDELETE(fPaintingData); - } + virtual ~GrPerlinNoiseEffect() { delete fPaintingData; } const char* name() const override { return "PerlinNoise"; } @@ -539,7 +535,7 @@ public: private: GrGLFragmentProcessor* onCreateGLInstance() const override { - return SkNEW_ARGS(GrGLPerlinNoise, (*this)); + return new GrGLPerlinNoise(*this); } virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, @@ -624,7 +620,7 @@ GrFragmentProcessor* GrPerlinNoiseEffect::TestCreate(GrProcessorTestData* d) { &paintColor, grPaint.getProcessorDataManager(), &effect)); - SkDELETE(shader); + delete shader; return effect; } @@ -968,7 +964,7 @@ bool SkPerlinNoiseShader::asFragmentProcessor(GrContext* context, const SkPaint& SkASSERT(!fStitchTiles || !fTileSize.isEmpty()); SkPerlinNoiseShader::PaintingData* paintingData = - SkNEW_ARGS(PaintingData, (fTileSize, fSeed, fBaseFrequencyX, fBaseFrequencyY, matrix)); + new PaintingData(fTileSize, fSeed, fBaseFrequencyX, fBaseFrequencyY, matrix); SkAutoTUnref<GrTexture> permutationsTexture( GrRefCachedBitmapTexture(context, paintingData->getPermutationsBitmap(), NULL)); SkAutoTUnref<GrTexture> noiseTexture( @@ -986,7 +982,7 @@ bool SkPerlinNoiseShader::asFragmentProcessor(GrContext* context, const SkPaint& permutationsTexture, noiseTexture, m, paint.getAlpha()); } else { - SkDELETE(paintingData); + delete paintingData; *fp = NULL; } return true; diff --git a/src/effects/SkRectShaderImageFilter.cpp b/src/effects/SkRectShaderImageFilter.cpp index 45962537c8..6309d35f45 100644 --- a/src/effects/SkRectShaderImageFilter.cpp +++ b/src/effects/SkRectShaderImageFilter.cpp @@ -20,12 +20,12 @@ SkRectShaderImageFilter* SkRectShaderImageFilter::Create(SkShader* s, const SkRe flags = 0x0; } CropRect cropRect(rect, flags); - return s ? SkNEW_ARGS(SkRectShaderImageFilter, (s, &cropRect)) : NULL; + return s ? new SkRectShaderImageFilter(s, &cropRect) : NULL; } SkRectShaderImageFilter* SkRectShaderImageFilter::Create(SkShader* s, const CropRect* cropRect) { SkASSERT(s); - return s ? SkNEW_ARGS(SkRectShaderImageFilter, (s, cropRect)) : NULL; + return s ? new SkRectShaderImageFilter(s, cropRect) : NULL; } SkRectShaderImageFilter::SkRectShaderImageFilter(SkShader* s, const CropRect* cropRect) diff --git a/src/effects/SkTableColorFilter.cpp b/src/effects/SkTableColorFilter.cpp index f39e88a366..e20f92292a 100644 --- a/src/effects/SkTableColorFilter.cpp +++ b/src/effects/SkTableColorFilter.cpp @@ -42,9 +42,7 @@ public: } } - virtual ~SkTable_ColorFilter() { - SkDELETE(fBitmap); - } + virtual ~SkTable_ColorFilter() { delete fBitmap; } bool asComponentTable(SkBitmap* table) const override; SkColorFilter* newComposed(const SkColorFilter* inner) const override; @@ -259,7 +257,7 @@ SkFlattenable* SkTable_ColorFilter::CreateProc(SkReadBuffer& buffer) { bool SkTable_ColorFilter::asComponentTable(SkBitmap* table) const { if (table) { if (NULL == fBitmap) { - SkBitmap* bmp = SkNEW(SkBitmap); + SkBitmap* bmp = new SkBitmap; bmp->allocPixels(SkImageInfo::MakeA8(256, 4)); uint8_t* bitmapPixels = bmp->getAddr8(0, 0); int offset = 0; @@ -482,7 +480,7 @@ GrFragmentProcessor* ColorTableEffect::Create(GrContext* context, SkBitmap bitma texture.reset(SkRef(atlas->getTexture())); } - return SkNEW_ARGS(ColorTableEffect, (texture, atlas, row, flags)); + return new ColorTableEffect(texture, atlas, row, flags); } ColorTableEffect::ColorTableEffect(GrTexture* texture, GrTextureStripAtlas* atlas, int row, @@ -507,7 +505,7 @@ void ColorTableEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, } GrGLFragmentProcessor* ColorTableEffect::onCreateGLInstance() const { - return SkNEW_ARGS(GLColorTableEffect, (*this)); + return new GLColorTableEffect(*this); } bool ColorTableEffect::onIsEqual(const GrFragmentProcessor& other) const { @@ -607,14 +605,14 @@ bool SkTable_ColorFilter::asFragmentProcessors(GrContext* context, /////////////////////////////////////////////////////////////////////////////// SkColorFilter* SkTableColorFilter::Create(const uint8_t table[256]) { - return SkNEW_ARGS(SkTable_ColorFilter, (table, table, table, table)); + return new SkTable_ColorFilter(table, table, table, table); } SkColorFilter* SkTableColorFilter::CreateARGB(const uint8_t tableA[256], const uint8_t tableR[256], const uint8_t tableG[256], const uint8_t tableB[256]) { - return SkNEW_ARGS(SkTable_ColorFilter, (tableA, tableR, tableG, tableB)); + return new SkTable_ColorFilter(tableA, tableR, tableG, tableB); } SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkTableColorFilter) diff --git a/src/effects/SkTileImageFilter.cpp b/src/effects/SkTileImageFilter.cpp index 2b7ed940d2..9292b26103 100644 --- a/src/effects/SkTileImageFilter.cpp +++ b/src/effects/SkTileImageFilter.cpp @@ -21,7 +21,7 @@ SkTileImageFilter* SkTileImageFilter::Create(const SkRect& srcRect, const SkRect if (!SkIsValidRect(srcRect) || !SkIsValidRect(dstRect)) { return NULL; } - return SkNEW_ARGS(SkTileImageFilter, (srcRect, dstRect, input)); + return new SkTileImageFilter(srcRect, dstRect, input); } bool SkTileImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src, diff --git a/src/effects/gradients/SkGradientBitmapCache.cpp b/src/effects/gradients/SkGradientBitmapCache.cpp index 63d708bad0..90fa3d54ad 100644 --- a/src/effects/gradients/SkGradientBitmapCache.cpp +++ b/src/effects/gradients/SkGradientBitmapCache.cpp @@ -108,7 +108,7 @@ void SkGradientBitmapCache::add(const void* buffer, size_t len, const SkBitmap& fEntryCount -= 1; } - Entry* entry = SkNEW_ARGS(Entry, (buffer, len, bm)); + Entry* entry = new Entry(buffer, len, bm); this->attachToHead(entry); fEntryCount += 1; } diff --git a/src/effects/gradients/SkGradientShader.cpp b/src/effects/gradients/SkGradientShader.cpp index ebfa75fef5..8bef3e3109 100644 --- a/src/effects/gradients/SkGradientShader.cpp +++ b/src/effects/gradients/SkGradientShader.cpp @@ -597,7 +597,7 @@ void SkGradientShaderBase::GradientShaderCache::initCache32(GradientShaderCache* SkGradientShaderBase::GradientShaderCache* SkGradientShaderBase::refCache(U8CPU alpha) const { SkAutoMutexAcquire ama(fCacheMutex); if (!fCache || fCache->getAlpha() != alpha) { - fCache.reset(SkNEW_ARGS(GradientShaderCache, (alpha, *this))); + fCache.reset(new GradientShaderCache(alpha, *this)); } // Increment the ref counter inside the mutex to ensure the returned pointer is still valid. // Otherwise, the pointer may have been overwritten on a different thread before the object's @@ -648,7 +648,7 @@ void SkGradientShaderBase::getGradientTableBitmap(SkBitmap* bitmap) const { SkAutoMutexAcquire ama(gGradientCacheMutex); if (NULL == gCache) { - gCache = SkNEW_ARGS(SkGradientBitmapCache, (MAX_NUM_CACHED_GRADIENT_BITMAPS)); + gCache = new SkGradientBitmapCache(MAX_NUM_CACHED_GRADIENT_BITMAPS); } size_t size = count * sizeof(int32_t); @@ -779,7 +779,7 @@ SkShader* SkGradientShader::CreateLinear(const SkPoint pts[2], SkGradientShaderBase::Descriptor desc; desc_init(&desc, colors, pos, colorCount, mode, flags, localMatrix); - return SkNEW_ARGS(SkLinearGradient, (pts, desc)); + return new SkLinearGradient(pts, desc); } SkShader* SkGradientShader::CreateRadial(const SkPoint& center, SkScalar radius, @@ -798,7 +798,7 @@ SkShader* SkGradientShader::CreateRadial(const SkPoint& center, SkScalar radius, SkGradientShaderBase::Descriptor desc; desc_init(&desc, colors, pos, colorCount, mode, flags, localMatrix); - return SkNEW_ARGS(SkRadialGradient, (center, radius, desc)); + return new SkRadialGradient(center, radius, desc); } SkShader* SkGradientShader::CreateTwoPointConical(const SkPoint& start, @@ -829,8 +829,8 @@ SkShader* SkGradientShader::CreateTwoPointConical(const SkPoint& start, if (!flipGradient) { desc_init(&desc, colors, pos, colorCount, mode, flags, localMatrix); - return SkNEW_ARGS(SkTwoPointConicalGradient, - (start, startRadius, end, endRadius, flipGradient, desc)); + return new SkTwoPointConicalGradient(start, startRadius, end, endRadius, flipGradient, + desc); } else { SkAutoSTArray<8, SkColor> colorsNew(colorCount); SkAutoSTArray<8, SkScalar> posNew(colorCount); @@ -847,8 +847,8 @@ SkShader* SkGradientShader::CreateTwoPointConical(const SkPoint& start, desc_init(&desc, colorsNew.get(), NULL, colorCount, mode, flags, localMatrix); } - return SkNEW_ARGS(SkTwoPointConicalGradient, - (end, endRadius, start, startRadius, flipGradient, desc)); + return new SkTwoPointConicalGradient(end, endRadius, start, startRadius, flipGradient, + desc); } } @@ -865,7 +865,7 @@ SkShader* SkGradientShader::CreateSweep(SkScalar cx, SkScalar cy, SkGradientShaderBase::Descriptor desc; desc_init(&desc, colors, pos, colorCount, SkShader::kClamp_TileMode, flags, localMatrix); - return SkNEW_ARGS(SkSweepGradient, (cx, cy, desc)); + return new SkSweepGradient(cx, cy, desc); } SK_DEFINE_FLATTENABLE_REGISTRAR_GROUP_START(SkGradientShader) diff --git a/src/effects/gradients/SkLinearGradient.cpp b/src/effects/gradients/SkLinearGradient.cpp index d9b4a5c9b0..a5be417637 100644 --- a/src/effects/gradients/SkLinearGradient.cpp +++ b/src/effects/gradients/SkLinearGradient.cpp @@ -83,7 +83,7 @@ size_t SkLinearGradient::contextSize() const { } SkShader::Context* SkLinearGradient::onCreateContext(const ContextRec& rec, void* storage) const { - return SkNEW_PLACEMENT_ARGS(storage, LinearGradientContext, (*this, rec)); + return new (storage) LinearGradientContext(*this, rec); } SkLinearGradient::LinearGradientContext::LinearGradientContext( @@ -472,7 +472,7 @@ public: const SkLinearGradient& shader, const SkMatrix& matrix, SkShader::TileMode tm) { - return SkNEW_ARGS(GrLinearGradient, (ctx, procDataManager, shader, matrix, tm)); + return new GrLinearGradient(ctx, procDataManager, shader, matrix, tm); } virtual ~GrLinearGradient() { } @@ -490,7 +490,7 @@ private: } GrGLFragmentProcessor* onCreateGLInstance() const override { - return SkNEW_ARGS(GrGLLinearGradient, (*this)); + return new GrGLLinearGradient(*this); } virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, diff --git a/src/effects/gradients/SkRadialGradient.cpp b/src/effects/gradients/SkRadialGradient.cpp index 1b995cb44f..7e249496ce 100644 --- a/src/effects/gradients/SkRadialGradient.cpp +++ b/src/effects/gradients/SkRadialGradient.cpp @@ -160,7 +160,7 @@ size_t SkRadialGradient::contextSize() const { } SkShader::Context* SkRadialGradient::onCreateContext(const ContextRec& rec, void* storage) const { - return SkNEW_PLACEMENT_ARGS(storage, RadialGradientContext, (*this, rec)); + return new (storage) RadialGradientContext(*this, rec); } SkRadialGradient::RadialGradientContext::RadialGradientContext( @@ -444,7 +444,7 @@ public: const SkRadialGradient& shader, const SkMatrix& matrix, SkShader::TileMode tm) { - return SkNEW_ARGS(GrRadialGradient, (ctx, procDataManager, shader, matrix, tm)); + return new GrRadialGradient(ctx, procDataManager, shader, matrix, tm); } virtual ~GrRadialGradient() { } @@ -462,7 +462,7 @@ private: } GrGLFragmentProcessor* onCreateGLInstance() const override { - return SkNEW_ARGS(GrGLRadialGradient, (*this)); + return new GrGLRadialGradient(*this); } virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, diff --git a/src/effects/gradients/SkSweepGradient.cpp b/src/effects/gradients/SkSweepGradient.cpp index 22bf68eaea..9e44b70298 100644 --- a/src/effects/gradients/SkSweepGradient.cpp +++ b/src/effects/gradients/SkSweepGradient.cpp @@ -50,7 +50,7 @@ size_t SkSweepGradient::contextSize() const { } SkShader::Context* SkSweepGradient::onCreateContext(const ContextRec& rec, void* storage) const { - return SkNEW_PLACEMENT_ARGS(storage, SweepGradientContext, (*this, rec)); + return new (storage) SweepGradientContext(*this, rec); } SkSweepGradient::SweepGradientContext::SweepGradientContext( @@ -193,7 +193,7 @@ class GrSweepGradient : public GrGradientEffect { public: static GrFragmentProcessor* Create(GrContext* ctx, GrProcessorDataManager* procDataManager, const SkSweepGradient& shader, const SkMatrix& m) { - return SkNEW_ARGS(GrSweepGradient, (ctx, procDataManager, shader, m)); + return new GrSweepGradient(ctx, procDataManager, shader, m); } virtual ~GrSweepGradient() { } @@ -209,7 +209,7 @@ private: } GrGLFragmentProcessor* onCreateGLInstance() const override { - return SkNEW_ARGS(GrGLSweepGradient, (*this)); + return new GrGLSweepGradient(*this); } virtual void onGetGLProcessorKey(const GrGLSLCaps& caps, diff --git a/src/effects/gradients/SkTwoPointConicalGradient.cpp b/src/effects/gradients/SkTwoPointConicalGradient.cpp index 1cdb19e1b9..7e5edf2569 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient.cpp @@ -217,7 +217,7 @@ size_t SkTwoPointConicalGradient::contextSize() const { SkShader::Context* SkTwoPointConicalGradient::onCreateContext(const ContextRec& rec, void* storage) const { - return SkNEW_PLACEMENT_ARGS(storage, TwoPointConicalGradientContext, (*this, rec)); + return new (storage) TwoPointConicalGradientContext(*this, rec); } SkTwoPointConicalGradient::TwoPointConicalGradientContext::TwoPointConicalGradientContext( diff --git a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp index 6f6048251b..cdc18629cf 100644 --- a/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp +++ b/src/effects/gradients/SkTwoPointConicalGradient_gpu.cpp @@ -63,7 +63,7 @@ public: const SkTwoPointConicalGradient& shader, const SkMatrix& matrix, SkShader::TileMode tm) { - return SkNEW_ARGS(Edge2PtConicalEffect, (ctx, procDataManager, shader, matrix, tm)); + return new Edge2PtConicalEffect(ctx, procDataManager, shader, matrix, tm); } virtual ~Edge2PtConicalEffect() {} @@ -175,7 +175,7 @@ void Edge2PtConicalEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, } GrGLFragmentProcessor* Edge2PtConicalEffect::onCreateGLInstance() const { - return SkNEW_ARGS(GLEdge2PtConicalEffect, (*this)); + return new GLEdge2PtConicalEffect(*this); } GR_DEFINE_FRAGMENT_PROCESSOR_TEST(Edge2PtConicalEffect); @@ -376,8 +376,7 @@ public: const SkMatrix& matrix, SkShader::TileMode tm, SkScalar focalX) { - return SkNEW_ARGS(FocalOutside2PtConicalEffect, (ctx, procDataManager, shader, matrix, tm, - focalX)); + return new FocalOutside2PtConicalEffect(ctx, procDataManager, shader, matrix, tm, focalX); } virtual ~FocalOutside2PtConicalEffect() { } @@ -458,7 +457,7 @@ void FocalOutside2PtConicalEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, } GrGLFragmentProcessor* FocalOutside2PtConicalEffect::onCreateGLInstance() const { - return SkNEW_ARGS(GLFocalOutside2PtConicalEffect, (*this)); + return new GLFocalOutside2PtConicalEffect(*this); } GR_DEFINE_FRAGMENT_PROCESSOR_TEST(FocalOutside2PtConicalEffect); @@ -593,8 +592,7 @@ public: const SkMatrix& matrix, SkShader::TileMode tm, SkScalar focalX) { - return SkNEW_ARGS(FocalInside2PtConicalEffect, (ctx, procDataManager, shader, matrix, tm, - focalX)); + return new FocalInside2PtConicalEffect(ctx, procDataManager, shader, matrix, tm, focalX); } virtual ~FocalInside2PtConicalEffect() {} @@ -670,7 +668,7 @@ void FocalInside2PtConicalEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, } GrGLFragmentProcessor* FocalInside2PtConicalEffect::onCreateGLInstance() const { - return SkNEW_ARGS(GLFocalInside2PtConicalEffect, (*this)); + return new GLFocalInside2PtConicalEffect(*this); } GR_DEFINE_FRAGMENT_PROCESSOR_TEST(FocalInside2PtConicalEffect); @@ -832,8 +830,7 @@ public: const SkMatrix& matrix, SkShader::TileMode tm, const CircleConicalInfo& info) { - return SkNEW_ARGS(CircleInside2PtConicalEffect, (ctx, procDataManager, shader, matrix, tm, - info)); + return new CircleInside2PtConicalEffect(ctx, procDataManager, shader, matrix, tm, info); } virtual ~CircleInside2PtConicalEffect() {} @@ -918,7 +915,7 @@ void CircleInside2PtConicalEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, } GrGLFragmentProcessor* CircleInside2PtConicalEffect::onCreateGLInstance() const { - return SkNEW_ARGS(GLCircleInside2PtConicalEffect, (*this)); + return new GLCircleInside2PtConicalEffect(*this); } GR_DEFINE_FRAGMENT_PROCESSOR_TEST(CircleInside2PtConicalEffect); @@ -1049,8 +1046,7 @@ public: const SkMatrix& matrix, SkShader::TileMode tm, const CircleConicalInfo& info) { - return SkNEW_ARGS(CircleOutside2PtConicalEffect, (ctx, procDataManager, shader, matrix, - tm, info)); + return new CircleOutside2PtConicalEffect(ctx, procDataManager, shader, matrix, tm, info); } virtual ~CircleOutside2PtConicalEffect() {} @@ -1150,7 +1146,7 @@ void CircleOutside2PtConicalEffect::onGetGLProcessorKey(const GrGLSLCaps& caps, } GrGLFragmentProcessor* CircleOutside2PtConicalEffect::onCreateGLInstance() const { - return SkNEW_ARGS(GLCircleOutside2PtConicalEffect, (*this)); + return new GLCircleOutside2PtConicalEffect(*this); } GR_DEFINE_FRAGMENT_PROCESSOR_TEST(CircleOutside2PtConicalEffect); |