diff options
| author |  Mike Reed <reed@google.com> | 2016-11-07 13:03:36 -0500 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-07 18:37:31 +0000 |
| commit | e9592f56c859752cf19095fb8ffeb6777835a65b (patch) | |
| tree | c9a047c2e4fa6a4e631e3e25ab6c77c9c4a0bb77 | |
| parent | 7234448c11b0493a072723acd185dae986103df6 (diff) | |
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>
| -rw-r--r-- | include/core/SkPaint.h | 3 | ||||
| -rw-r--r-- | include/core/SkTypes.h | 5 | ||||
| -rw-r--r-- | src/core/SkPaint.cpp | 7 |
3 files changed, 0 insertions, 15 deletions
diff --git a/include/core/SkPaint.h b/include/core/SkPaint.h index 5bb168683a..ace98fabf0 100644 --- a/include/core/SkPaint.h +++ b/include/core/SkPaint.h @@ -604,9 +604,6 @@ public: 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 d9dd448b83..0a3e3ac487 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 a72309a68c..82f1c827a7 100644 --- a/src/core/SkPaint.cpp +++ b/src/core/SkPaint.cpp @@ -367,13 +367,6 @@ MOVE_FIELD(DrawLooper) #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) { |