remove obsolete flags
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4498
Change-Id: I89941135d223a0ca13c705e9bed6231011f86f40
Reviewed-on: https://skia-review.googlesource.com/4498
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h
index 5bb1686..ace98fa 100644
--- a/include/core/SkPaint.h
+++ b/include/core/SkPaint.h
@@ -604,9 +604,6 @@
SkImageFilter* getImageFilter() const { return fImageFilter.get(); }
void setImageFilter(sk_sp<SkImageFilter>);
-#ifdef SK_SUPPORT_LEGACY_SETIMAGEFILTER_PTR
- SkImageFilter* setImageFilter(SkImageFilter*);
-#endif
/**
* Return the paint's SkDrawLooper (if any). Does not affect the looper's
diff --git a/include/core/SkTypes.h b/include/core/SkTypes.h
index d9dd448..0a3e3ac 100644
--- a/include/core/SkTypes.h
+++ b/include/core/SkTypes.h
@@ -35,11 +35,6 @@
#include <string.h>
-#ifdef SK_SUPPORT_LEGACY_XFERMODE_PARAM_TYPES
- #define SK_XFERMODE_PARAM SkBlendMode
- #define SK_XFERMODE_MODE_PARAM SkBlendMode
-#endif
-
/**
* sk_careful_memcpy() is just like memcpy(), but guards against undefined behavior.
*
diff --git a/src/core/SkPaint.cpp b/src/core/SkPaint.cpp
index a72309a..82f1c82 100644
--- a/src/core/SkPaint.cpp
+++ b/src/core/SkPaint.cpp
@@ -367,13 +367,6 @@
#undef MOVE_FIELD
void SkPaint::setLooper(sk_sp<SkDrawLooper> looper) { fDrawLooper = std::move(looper); }
-#ifdef SK_SUPPORT_LEGACY_SETIMAGEFILTER_PTR
-SkImageFilter* SkPaint::setImageFilter(SkImageFilter* imf) {
- this->setImageFilter(sk_ref_sp(imf));
- return imf;
-}
-#endif
-
///////////////////////////////////////////////////////////////////////////////
static SkScalar mag2(SkScalar x, SkScalar y) {