aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/core
diff options
context:
space:
mode:
Diffstat (limited to 'include/core')
-rw-r--r--include/core/SkColorFilter.h15
-rw-r--r--include/core/SkImage.h5
-rw-r--r--include/core/SkImageFilter.h14
-rw-r--r--include/core/SkPaint.h14
-rw-r--r--include/core/SkShader.h22
-rw-r--r--include/core/SkXfermode.h9
6 files changed, 1 insertions, 78 deletions
diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h
index 5a23a343a2..485739842a 100644
--- a/include/core/SkColorFilter.h
+++ b/include/core/SkColorFilter.h
@@ -134,21 +134,6 @@ public:
*/
static sk_sp<SkColorFilter> MakeMatrixFilterRowMajor255(const SkScalar array[20]);
-#ifdef SK_SUPPORT_LEGACY_COLORFILTER_PTR
- static SkColorFilter* CreateModeFilter(SkColor c, SkXfermode::Mode mode) {
- return MakeModeFilter(c, mode).release();
- }
- static SkColorFilter* CreateComposeFilter(SkColorFilter* outer, SkColorFilter* inner) {
- return MakeComposeFilter(sk_ref_sp(outer), sk_ref_sp(inner)).release();
- }
- static SkColorFilter* CreateMatrixFilterRowMajor255(const SkScalar array[20]) {
- return MakeMatrixFilterRowMajor255(array).release();
- }
- virtual SkColorFilter* newComposed(const SkColorFilter* inner) const {
- return this->makeComposed(sk_ref_sp(const_cast<SkColorFilter*>(inner))).release();
- }
-#endif
-
#if SK_SUPPORT_GPU
/**
* A subclass may implement this factory function to work with the GPU backend. It returns
diff --git a/include/core/SkImage.h b/include/core/SkImage.h
index 1f9d9f8348..b67f0a3d09 100644
--- a/include/core/SkImage.h
+++ b/include/core/SkImage.h
@@ -176,11 +176,6 @@ public:
bool readYUV8Planes(const SkISize[3], void* const planes[3], const size_t rowBytes[3],
SkYUVColorSpace) const;
-#ifdef SK_SUPPORT_LEGACY_CREATESHADER_PTR
- SkShader* newShader(SkShader::TileMode, SkShader::TileMode,
- const SkMatrix* localMatrix = nullptr) const;
-#endif
-
sk_sp<SkShader> makeShader(SkShader::TileMode, SkShader::TileMode,
const SkMatrix* localMatrix = nullptr) const;
diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h
index 9188a89e27..c2d7261196 100644
--- a/include/core/SkImageFilter.h
+++ b/include/core/SkImageFilter.h
@@ -223,12 +223,6 @@ public:
*/
sk_sp<SkImageFilter> makeWithLocalMatrix(const SkMatrix&) const;
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
- SkImageFilter* newWithLocalMatrix(const SkMatrix& matrix) const {
- return this->makeWithLocalMatrix(matrix).release();
- }
-#endif
-
/**
* ImageFilters can natively handle scaling and translate components in the CTM. Only some of
* them can handle affine (or more complex) matrices. This call returns true iff the filter
@@ -243,14 +237,6 @@ public:
SkFilterQuality quality,
sk_sp<SkImageFilter> input);
-#ifdef SK_SUPPORT_LEGACY_IMAGEFILTER_PTR
- static SkImageFilter* CreateMatrixFilter(const SkMatrix& matrix,
- SkFilterQuality filterQuality,
- SkImageFilter* input = nullptr) {
- return MakeMatrixFilter(matrix, filterQuality, sk_ref_sp<SkImageFilter>(input)).release();
- }
-#endif
-
SK_TO_STRING_PUREVIRT()
SK_DEFINE_FLATTENABLE_TYPE(SkImageFilter)
SK_DECLARE_FLATTENABLE_REGISTRAR_GROUP()
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index ddc90ae19c..2e4f2f9edd 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -503,12 +503,8 @@ public:
* If a previous shader exists, its reference count is decremented.
* If shader is not NULL, its reference count is incremented.
* @param shader May be NULL. The shader to be installed in the paint
- * @return shader
*/
void setShader(sk_sp<SkShader>);
-#ifdef SK_SUPPORT_LEGACY_CREATESHADER_PTR
- SkShader* setShader(SkShader* shader);
-#endif
/** Get the paint's colorfilter. If there is a colorfilter, its reference
count is not changed.
@@ -516,16 +512,12 @@ public:
*/
SkColorFilter* getColorFilter() const { return fColorFilter.get(); }
- /** Set or clear the paint's colorfilter, returning the parameter.
+ /** Set or clear the paint's colorfilter.
<p />
If the paint already has a filter, its reference count is decremented.
If filter is not NULL, its reference count is incremented.
@param filter May be NULL. The filter to be installed in the paint
- @return filter
*/
-#ifdef SK_SUPPORT_LEGACY_COLORFILTER_PTR
- SkColorFilter* setColorFilter(SkColorFilter* filter);
-#endif
void setColorFilter(sk_sp<SkColorFilter>);
#ifdef SK_SUPPORT_LEGACY_XFERMODE_OBJECT
@@ -544,12 +536,8 @@ public:
If xfermode is not NULL, its reference count is incremented.
@param xfermode May be NULL. The new xfermode to be installed in the
paint
- @return xfermode
*/
void setXfermode(sk_sp<SkXfermode>);
-#ifdef SK_SUPPORT_LEGACY_XFERMODE_PTR
- SkXfermode* setXfermode(SkXfermode* xfermode);
-#endif
/** Create an xfermode based on the specified Mode, and assign it into the
paint, returning the mode that was set. If the Mode is SrcOver, then
diff --git a/include/core/SkShader.h b/include/core/SkShader.h
index f9796d6c1a..161e6081dd 100644
--- a/include/core/SkShader.h
+++ b/include/core/SkShader.h
@@ -423,24 +423,6 @@ public:
static sk_sp<SkShader> MakeComposeShader(sk_sp<SkShader> dst, sk_sp<SkShader> src,
SkXfermode::Mode);
-#ifdef SK_SUPPORT_LEGACY_CREATESHADER_PTR
- static SkShader* CreateEmptyShader() { return MakeEmptyShader().release(); }
- static SkShader* CreateColorShader(SkColor c) { return MakeColorShader(c).release(); }
- static SkShader* CreateBitmapShader(const SkBitmap& src, TileMode tmx, TileMode tmy,
- const SkMatrix* localMatrix = nullptr) {
- return MakeBitmapShader(src, tmx, tmy, localMatrix).release();
- }
- static SkShader* CreateComposeShader(SkShader* dst, SkShader* src, SkXfermode::Mode mode);
- static SkShader* CreateComposeShader(SkShader* dst, SkShader* src, SkXfermode* xfer);
- static SkShader* CreatePictureShader(const SkPicture* src, TileMode tmx, TileMode tmy,
- const SkMatrix* localMatrix, const SkRect* tile);
-
- SkShader* newWithLocalMatrix(const SkMatrix& matrix) const {
- return this->makeWithLocalMatrix(matrix).release();
- }
- SkShader* newWithColorFilter(SkColorFilter* filter) const;
-#endif
-
/**
* Create a new compose shader, given shaders dst, src, and a combining xfermode mode.
* The xfermode is called with the output of the two shaders, and its output is returned.
@@ -450,10 +432,6 @@ public:
*/
static sk_sp<SkShader> MakeComposeShader(sk_sp<SkShader> dst, sk_sp<SkShader> src,
sk_sp<SkXfermode> xfer);
-#ifdef SK_SUPPORT_LEGACY_XFERMODE_PTR
- static sk_sp<SkShader> MakeComposeShader(sk_sp<SkShader> dst, sk_sp<SkShader> src,
- SkXfermode* xfer);
-#endif
/** Call this to create a new shader that will draw with the specified bitmap.
*
diff --git a/include/core/SkXfermode.h b/include/core/SkXfermode.h
index 253ee1b408..82036dfc39 100644
--- a/include/core/SkXfermode.h
+++ b/include/core/SkXfermode.h
@@ -153,15 +153,6 @@ public:
/** Return an SkXfermode object for the specified mode.
*/
static sk_sp<SkXfermode> Make(Mode);
-#ifdef SK_SUPPORT_LEGACY_XFERMODE_PTR
- static SkXfermode* Create(Mode mode) {
- return Make(mode).release();
- }
- SK_ATTR_DEPRECATED("use AsMode(...)")
- static bool IsMode(const SkXfermode* xfer, Mode* mode) {
- return AsMode(xfer, mode);
- }
-#endif
/**
* Skia maintains global xfermode objects corresponding to each BlendMode. This returns a
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-30 03:23:53 +0000