aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/effects
diff options
context:
space:
mode:
Diffstat (limited to 'include/effects')
-rw-r--r--include/effects/Sk1DPathEffect.h2
-rw-r--r--include/effects/Sk2DPathEffect.h4
-rw-r--r--include/effects/SkArcToPathEffect.h2
-rw-r--r--include/effects/SkBitmapSource.h6
-rw-r--r--include/effects/SkBlurDrawLooper.h2
-rw-r--r--include/effects/SkBlurImageFilter.h2
-rw-r--r--include/effects/SkColorMatrixFilter.h4
-rw-r--r--include/effects/SkComposeImageFilter.h2
-rw-r--r--include/effects/SkCornerPathEffect.h4
-rw-r--r--include/effects/SkDashPathEffect.h2
-rw-r--r--include/effects/SkDiscretePathEffect.h3
-rw-r--r--include/effects/SkDropShadowImageFilter.h4
-rw-r--r--include/effects/SkMergeImageFilter.h4
-rw-r--r--include/effects/SkMorphologyImageFilter.h4
-rw-r--r--include/effects/SkOffsetImageFilter.h2
-rw-r--r--include/effects/SkPictureImageFilter.h11
-rw-r--r--include/effects/SkPixelXorXfermode.h4
-rw-r--r--include/effects/SkTableMaskFilter.h6
-rw-r--r--include/effects/SkTestImageFilters.h2
-rw-r--r--include/effects/SkXfermodeImageFilter.h2
20 files changed, 32 insertions, 40 deletions
diff --git a/include/effects/Sk1DPathEffect.h b/include/effects/Sk1DPathEffect.h
index 6b3ec6d673..6a7804f111 100644
--- a/include/effects/Sk1DPathEffect.h
+++ b/include/effects/Sk1DPathEffect.h
@@ -58,7 +58,7 @@ public:
*/
static SkPath1DPathEffect* Create(const SkPath& path, SkScalar advance, SkScalar phase,
Style style) {
- return SkNEW_ARGS(SkPath1DPathEffect, (path, advance, phase, style));
+ return new SkPath1DPathEffect(path, advance, phase, style);
}
virtual bool filterPath(SkPath*, const SkPath&,
diff --git a/include/effects/Sk2DPathEffect.h b/include/effects/Sk2DPathEffect.h
index 7fbf94b14d..fa12dcf095 100644
--- a/include/effects/Sk2DPathEffect.h
+++ b/include/effects/Sk2DPathEffect.h
@@ -56,7 +56,7 @@ private:
class SK_API SkLine2DPathEffect : public Sk2DPathEffect {
public:
static SkLine2DPathEffect* Create(SkScalar width, const SkMatrix& matrix) {
- return SkNEW_ARGS(SkLine2DPathEffect, (width, matrix));
+ return new SkLine2DPathEffect(width, matrix);
}
virtual bool filterPath(SkPath* dst, const SkPath& src,
@@ -85,7 +85,7 @@ public:
* the latice.
*/
static SkPath2DPathEffect* Create(const SkMatrix& matrix, const SkPath& path) {
- return SkNEW_ARGS(SkPath2DPathEffect, (matrix, path));
+ return new SkPath2DPathEffect(matrix, path);
}
SK_TO_STRING_OVERRIDE()
diff --git a/include/effects/SkArcToPathEffect.h b/include/effects/SkArcToPathEffect.h
index 6ae7e36485..4716ea125d 100644
--- a/include/effects/SkArcToPathEffect.h
+++ b/include/effects/SkArcToPathEffect.h
@@ -19,7 +19,7 @@ public:
if (radius <= 0) {
return NULL;
}
- return SkNEW_ARGS(SkArcToPathEffect, (radius));
+ return new SkArcToPathEffect(radius);
}
bool filterPath(SkPath* dst, const SkPath& src, SkStrokeRec*, const SkRect*) const override;
diff --git a/include/effects/SkBitmapSource.h b/include/effects/SkBitmapSource.h
index e4281c9619..38b13020eb 100644
--- a/include/effects/SkBitmapSource.h
+++ b/include/effects/SkBitmapSource.h
@@ -13,13 +13,11 @@
class SK_API SkBitmapSource : public SkImageFilter {
public:
- static SkBitmapSource* Create(const SkBitmap& bitmap) {
- return SkNEW_ARGS(SkBitmapSource, (bitmap));
- }
+ static SkBitmapSource* Create(const SkBitmap& bitmap) { return new SkBitmapSource(bitmap); }
static SkBitmapSource* Create(const SkBitmap& bitmap,
const SkRect& srcRect, const SkRect& dstRect,
SkFilterQuality filterQuality = kHigh_SkFilterQuality) {
- return SkNEW_ARGS(SkBitmapSource, (bitmap, srcRect, dstRect, filterQuality));
+ return new SkBitmapSource(bitmap, srcRect, dstRect, filterQuality);
}
void computeFastBounds(const SkRect& src, SkRect* dst) const override;
diff --git a/include/effects/SkBlurDrawLooper.h b/include/effects/SkBlurDrawLooper.h
index 26bcd52252..808557b9da 100644
--- a/include/effects/SkBlurDrawLooper.h
+++ b/include/effects/SkBlurDrawLooper.h
@@ -37,7 +37,7 @@ public:
static SkBlurDrawLooper* Create(SkColor color, SkScalar sigma, SkScalar dx, SkScalar dy,
uint32_t flags = kNone_BlurFlag) {
- return SkNEW_ARGS(SkBlurDrawLooper, (color, sigma, dx, dy, flags));
+ return new SkBlurDrawLooper(color, sigma, dx, dy, flags);
}
virtual ~SkBlurDrawLooper();
diff --git a/include/effects/SkBlurImageFilter.h b/include/effects/SkBlurImageFilter.h
index ec29c8e237..b0bd30988f 100644
--- a/include/effects/SkBlurImageFilter.h
+++ b/include/effects/SkBlurImageFilter.h
@@ -17,7 +17,7 @@ public:
SkScalar sigmaY,
SkImageFilter* input = NULL,
const CropRect* cropRect = NULL) {
- return SkNEW_ARGS(SkBlurImageFilter, (sigmaX, sigmaY, input, cropRect));
+ return new SkBlurImageFilter(sigmaX, sigmaY, input, cropRect);
}
void computeFastBounds(const SkRect&, SkRect*) const override;
diff --git a/include/effects/SkColorMatrixFilter.h b/include/effects/SkColorMatrixFilter.h
index a129654cbb..9f16643bd6 100644
--- a/include/effects/SkColorMatrixFilter.h
+++ b/include/effects/SkColorMatrixFilter.h
@@ -14,10 +14,10 @@
class SK_API SkColorMatrixFilter : public SkColorFilter {
public:
static SkColorMatrixFilter* Create(const SkColorMatrix& cm) {
- return SkNEW_ARGS(SkColorMatrixFilter, (cm));
+ return new SkColorMatrixFilter(cm);
}
static SkColorMatrixFilter* Create(const SkScalar array[20]) {
- return SkNEW_ARGS(SkColorMatrixFilter, (array));
+ return new SkColorMatrixFilter(array);
}
void filterSpan(const SkPMColor src[], int count, SkPMColor[]) const override;
diff --git a/include/effects/SkComposeImageFilter.h b/include/effects/SkComposeImageFilter.h
index e3dc1ffb23..4946fa13d0 100644
--- a/include/effects/SkComposeImageFilter.h
+++ b/include/effects/SkComposeImageFilter.h
@@ -22,7 +22,7 @@ public:
return SkRef(outer);
}
SkImageFilter* inputs[2] = { outer, inner };
- return SkNEW_ARGS(SkComposeImageFilter, (inputs));
+ return new SkComposeImageFilter(inputs);
}
void computeFastBounds(const SkRect& src, SkRect* dst) const override;
diff --git a/include/effects/SkCornerPathEffect.h b/include/effects/SkCornerPathEffect.h
index 19357903ec..4c8908575d 100644
--- a/include/effects/SkCornerPathEffect.h
+++ b/include/effects/SkCornerPathEffect.h
@@ -20,9 +20,7 @@ public:
/** radius must be > 0 to have an effect. It specifies the distance from each corner
that should be "rounded".
*/
- static SkCornerPathEffect* Create(SkScalar radius) {
- return SkNEW_ARGS(SkCornerPathEffect, (radius));
- }
+ static SkCornerPathEffect* Create(SkScalar radius) { return new SkCornerPathEffect(radius); }
virtual ~SkCornerPathEffect();
virtual bool filterPath(SkPath* dst, const SkPath& src,
diff --git a/include/effects/SkDashPathEffect.h b/include/effects/SkDashPathEffect.h
index 0fd00d70af..d3adeed99a 100644
--- a/include/effects/SkDashPathEffect.h
+++ b/include/effects/SkDashPathEffect.h
@@ -38,7 +38,7 @@ public:
*/
static SkDashPathEffect* Create(const SkScalar intervals[], int count,
SkScalar phase) {
- return SkNEW_ARGS(SkDashPathEffect, (intervals, count, phase));
+ return new SkDashPathEffect(intervals, count, phase);
}
virtual ~SkDashPathEffect();
diff --git a/include/effects/SkDiscretePathEffect.h b/include/effects/SkDiscretePathEffect.h
index d05d181de0..b55dca8644 100644
--- a/include/effects/SkDiscretePathEffect.h
+++ b/include/effects/SkDiscretePathEffect.h
@@ -32,8 +32,7 @@ public:
static SkDiscretePathEffect* Create(SkScalar segLength,
SkScalar deviation,
uint32_t seedAssist=0) {
- return SkNEW_ARGS(SkDiscretePathEffect,
- (segLength, deviation, seedAssist));
+ return new SkDiscretePathEffect(segLength, deviation, seedAssist);
}
virtual bool filterPath(SkPath* dst, const SkPath& src,
diff --git a/include/effects/SkDropShadowImageFilter.h b/include/effects/SkDropShadowImageFilter.h
index 3ff3d8044e..964a5763d3 100644
--- a/include/effects/SkDropShadowImageFilter.h
+++ b/include/effects/SkDropShadowImageFilter.h
@@ -25,8 +25,8 @@ public:
ShadowMode shadowMode,
SkImageFilter* input = NULL,
const CropRect* cropRect = NULL) {
- return SkNEW_ARGS(SkDropShadowImageFilter, (dx, dy, sigmaX, sigmaY, color,
- shadowMode, input, cropRect));
+ return new SkDropShadowImageFilter(dx, dy, sigmaX, sigmaY, color, shadowMode, input,
+ cropRect);
}
void computeFastBounds(const SkRect&, SkRect*) const override;
diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h
index 5bb6826b6b..714a755021 100644
--- a/include/effects/SkMergeImageFilter.h
+++ b/include/effects/SkMergeImageFilter.h
@@ -21,12 +21,12 @@ public:
const CropRect* cropRect = NULL) {
SkImageFilter* inputs[2] = { first, second };
SkXfermode::Mode modes[2] = { mode, mode };
- return SkNEW_ARGS(SkMergeImageFilter, (inputs, 2, modes, cropRect));
+ return new SkMergeImageFilter(inputs, 2, modes, cropRect);
}
static SkMergeImageFilter* Create(SkImageFilter* filters[], int count,
const SkXfermode::Mode modes[] = NULL,
const CropRect* cropRect = NULL) {
- return SkNEW_ARGS(SkMergeImageFilter, (filters, count, modes, cropRect));
+ return new SkMergeImageFilter(filters, count, modes, cropRect);
}
SK_TO_STRING_OVERRIDE()
diff --git a/include/effects/SkMorphologyImageFilter.h b/include/effects/SkMorphologyImageFilter.h
index 3a242250cb..8d17609e5f 100644
--- a/include/effects/SkMorphologyImageFilter.h
+++ b/include/effects/SkMorphologyImageFilter.h
@@ -57,7 +57,7 @@ public:
if (radiusX < 0 || radiusY < 0) {
return NULL;
}
- return SkNEW_ARGS(SkDilateImageFilter, (radiusX, radiusY, input, cropRect));
+ return new SkDilateImageFilter(radiusX, radiusY, input, cropRect);
}
bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
@@ -85,7 +85,7 @@ public:
if (radiusX < 0 || radiusY < 0) {
return NULL;
}
- return SkNEW_ARGS(SkErodeImageFilter, (radiusX, radiusY, input, cropRect));
+ return new SkErodeImageFilter(radiusX, radiusY, input, cropRect);
}
bool onFilterImage(Proxy*, const SkBitmap& src, const Context&,
diff --git a/include/effects/SkOffsetImageFilter.h b/include/effects/SkOffsetImageFilter.h
index 17c9627f83..30e380d89b 100644
--- a/include/effects/SkOffsetImageFilter.h
+++ b/include/effects/SkOffsetImageFilter.h
@@ -20,7 +20,7 @@ public:
if (!SkScalarIsFinite(dx) || !SkScalarIsFinite(dy)) {
return NULL;
}
- return SkNEW_ARGS(SkOffsetImageFilter, (dx, dy, input, cropRect));
+ return new SkOffsetImageFilter(dx, dy, input, cropRect);
}
void computeFastBounds(const SkRect& src, SkRect* dst) const override;
SK_TO_STRING_OVERRIDE()
diff --git a/include/effects/SkPictureImageFilter.h b/include/effects/SkPictureImageFilter.h
index 731e11e48c..231a492900 100644
--- a/include/effects/SkPictureImageFilter.h
+++ b/include/effects/SkPictureImageFilter.h
@@ -17,7 +17,7 @@ public:
* Refs the passed-in picture.
*/
static SkPictureImageFilter* Create(const SkPicture* picture) {
- return SkNEW_ARGS(SkPictureImageFilter, (picture));
+ return new SkPictureImageFilter(picture);
}
/**
@@ -25,9 +25,8 @@ public:
* the picture is drawn. (No scaling is implied by the dest rect; only the CTM is applied.)
*/
static SkPictureImageFilter* Create(const SkPicture* picture, const SkRect& cropRect) {
- return SkNEW_ARGS(SkPictureImageFilter, (picture, cropRect,
- kDeviceSpace_PictureResolution,
- kLow_SkFilterQuality));
+ return new SkPictureImageFilter(picture, cropRect, kDeviceSpace_PictureResolution,
+ kLow_SkFilterQuality);
}
/**
@@ -40,8 +39,8 @@ public:
static SkPictureImageFilter* CreateForLocalSpace(const SkPicture* picture,
const SkRect& cropRect,
SkFilterQuality filterQuality) {
- return SkNEW_ARGS(SkPictureImageFilter, (picture, cropRect,
- kLocalSpace_PictureResolution, filterQuality));
+ return new SkPictureImageFilter(picture, cropRect, kLocalSpace_PictureResolution,
+ filterQuality);
}
SK_TO_STRING_OVERRIDE()
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPictureImageFilter)
diff --git a/include/effects/SkPixelXorXfermode.h b/include/effects/SkPixelXorXfermode.h
index 3e6fa8415a..8b7f3388ff 100644
--- a/include/effects/SkPixelXorXfermode.h
+++ b/include/effects/SkPixelXorXfermode.h
@@ -17,9 +17,7 @@
*/
class SK_API SkPixelXorXfermode : public SkXfermode {
public:
- static SkPixelXorXfermode* Create(SkColor opColor) {
- return SkNEW_ARGS(SkPixelXorXfermode, (opColor));
- }
+ static SkPixelXorXfermode* Create(SkColor opColor) { return new SkPixelXorXfermode(opColor); }
SK_TO_STRING_OVERRIDE()
SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkPixelXorXfermode)
diff --git a/include/effects/SkTableMaskFilter.h b/include/effects/SkTableMaskFilter.h
index 6084ec4061..1d530877cc 100644
--- a/include/effects/SkTableMaskFilter.h
+++ b/include/effects/SkTableMaskFilter.h
@@ -30,19 +30,19 @@ public:
static void MakeClipTable(uint8_t table[256], uint8_t min, uint8_t max);
static SkTableMaskFilter* Create(const uint8_t table[256]) {
- return SkNEW_ARGS(SkTableMaskFilter, (table));
+ return new SkTableMaskFilter(table);
}
static SkTableMaskFilter* CreateGamma(SkScalar gamma) {
uint8_t table[256];
MakeGammaTable(table, gamma);
- return SkNEW_ARGS(SkTableMaskFilter, (table));
+ return new SkTableMaskFilter(table);
}
static SkTableMaskFilter* CreateClip(uint8_t min, uint8_t max) {
uint8_t table[256];
MakeClipTable(table, min, max);
- return SkNEW_ARGS(SkTableMaskFilter, (table));
+ return new SkTableMaskFilter(table);
}
SkMask::Format getFormat() const override;
diff --git a/include/effects/SkTestImageFilters.h b/include/effects/SkTestImageFilters.h
index 233d7b2fd3..4fa0c430f3 100644
--- a/include/effects/SkTestImageFilters.h
+++ b/include/effects/SkTestImageFilters.h
@@ -22,7 +22,7 @@ public:
if (scale > SK_Scalar1 || scale <= 0) {
return NULL;
}
- return SkNEW_ARGS(SkDownSampleImageFilter, (scale, input));
+ return new SkDownSampleImageFilter(scale, input);
}
SK_TO_STRING_OVERRIDE()
diff --git a/include/effects/SkXfermodeImageFilter.h b/include/effects/SkXfermodeImageFilter.h
index 30a3a5ccd5..57fd288f24 100644
--- a/include/effects/SkXfermodeImageFilter.h
+++ b/include/effects/SkXfermodeImageFilter.h
@@ -27,7 +27,7 @@ public:
SkImageFilter* foreground = NULL,
const CropRect* cropRect = NULL) {
SkImageFilter* inputs[2] = { background, foreground };
- return SkNEW_ARGS(SkXfermodeImageFilter, (mode, inputs, cropRect));
+ return new SkXfermodeImageFilter(mode, inputs, cropRect);
}
SK_TO_STRING_OVERRIDE()
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-05 23:18:05 +0000