| Index: src/effects/SkDisplacementMapEffect.cpp
|
| diff --git a/src/effects/SkDisplacementMapEffect.cpp b/src/effects/SkDisplacementMapEffect.cpp
|
| index f360fe102c94637cd1ef12ad4a6a4ba68ee51da0..0c2cb8ac7ee6a3c7e07134827c3ddddd91dbe592 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,
|
|
|