From faba3715b8ddfaa0ce4df79bc8006e9bc7694e5b Mon Sep 17 00:00:00 2001 From: Mike Reed Date: Thu, 3 Nov 2016 14:45:31 -0400 Subject: remove unused code around SK_SUPPORT_LEGACY_XFERMODE_PARAM BUG=skia: GOLD_TRYBOT_URL= https://gold.skia.org/search?issue=4384 Change-Id: I5121acd027d935ade169ff65941f29f654a47bd0 Reviewed-on: https://skia-review.googlesource.com/4384 Reviewed-by: Mike Reed Commit-Queue: Mike Reed --- include/core/SkColorFilter.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'include/core/SkColorFilter.h') diff --git a/include/core/SkColorFilter.h b/include/core/SkColorFilter.h index fa6c9db972..346e721c92 100644 --- a/include/core/SkColorFilter.h +++ b/include/core/SkColorFilter.h @@ -34,7 +34,7 @@ public: * returns true, and sets (if not NULL) the color and mode appropriately. * If not, this returns false and ignores the parameters. */ - virtual bool asColorMode(SkColor* color, SK_XFERMODE_MODE_PARAM* mode) const; + virtual bool asColorMode(SkColor* color, SkBlendMode* bmode) const; /** * If the filter can be represented by a 5x4 matrix, this @@ -116,11 +116,6 @@ public: or NULL if the mode will have no effect. */ static sk_sp MakeModeFilter(SkColor c, SkBlendMode mode); -#ifdef SK_SUPPORT_LEGACY_XFERMODE_PARAM - static sk_sp MakeModeFilter(SkColor c, SkXfermode::Mode mode) { - return MakeModeFilter(c, (SkBlendMode)mode); - } -#endif /** Construct a colorfilter whose effect is to first apply the inner filter and then apply * the outer filter to the result of the inner's. -- cgit v1.2.3