diff options
| author |  Mike Reed <reed@google.com> | 2017-05-03 10:52:00 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-05-03 15:46:55 +0000 |
| commit | a9e241d357641493ba1908cd36cf43d16490421b (patch) | |
| tree | 74166d93910ab878afec692d3b332790f65bb5d3 /include | |
| parent | 9d5f66d9c21eda7d3e2ed47654180c0c4b6e38b1 (diff) | |
drawfilter is legacy-guarded, no need for deprecated
Bug: skia:
Change-Id: Ic8dbe9aa043bd793e49975f5b6f08a0ac38e4faa
Reviewed-on: https://skia-review.googlesource.com/15185
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/core/SkCanvas.h | 7 | ||||
| -rw-r--r-- | include/core/SkPostConfig.h | 8 |
2 files changed, 0 insertions, 15 deletions
diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index a259e531f3..37896dea45 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -1157,18 +1157,12 @@ public: } ////////////////////////////////////////////////////////////////////////// -#ifdef SK_INTERNAL -#ifndef SK_SUPPORT_LEGACY_DRAWFILTER - #define SK_SUPPORT_LEGACY_DRAWFILTER -#endif -#endif #ifdef SK_SUPPORT_LEGACY_DRAWFILTER /** Get the current filter object. The filter's reference count is not affected. The filter is saved/restored, just like the matrix and clip. @return the canvas' filter (or NULL). */ - SK_ATTR_EXTERNALLY_DEPRECATED("getDrawFilter use is deprecated") SkDrawFilter* getDrawFilter() const; /** Set the new filter (or NULL). Pass NULL to clear any existing filter. @@ -1179,7 +1173,6 @@ public: @param filter the new filter (or NULL) @return the new filter */ - SK_ATTR_EXTERNALLY_DEPRECATED("setDrawFilter use is deprecated") virtual SkDrawFilter* setDrawFilter(SkDrawFilter* filter); #endif ////////////////////////////////////////////////////////////////////////// diff --git a/include/core/SkPostConfig.h b/include/core/SkPostConfig.h index c34397cde6..0bf33d478a 100644 --- a/include/core/SkPostConfig.h +++ b/include/core/SkPostConfig.h @@ -248,14 +248,6 @@ # define SK_ATTR_DEPRECATED(msg) SK_ATTRIBUTE(deprecated) #endif -#if !defined(SK_ATTR_EXTERNALLY_DEPRECATED) -# if !defined(SK_INTERNAL) -# define SK_ATTR_EXTERNALLY_DEPRECATED(msg) SK_ATTR_DEPRECATED(msg) -# else -# define SK_ATTR_EXTERNALLY_DEPRECATED(msg) -# endif -#endif - /** * If your judgment is better than the compiler's (i.e. you've profiled it), * you can use SK_ALWAYS_INLINE to force inlining. E.g. |