diff options
| author |  Mike Reed <reed@google.com> | 2016-11-03 14:45:31 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2016-11-03 19:54:08 +0000 |
| commit | faba3715b8ddfaa0ce4df79bc8006e9bc7694e5b (patch) | |
| tree | 7d12df48b54ebdb69209e784872831f32abbe30f /include/effects/SkMergeImageFilter.h | |
| parent | 8b1fb741f196b78479b9d5bb2b33875aaa9709bb (diff) | |
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 <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'include/effects/SkMergeImageFilter.h')
| -rw-r--r-- | include/effects/SkMergeImageFilter.h | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h index 324501689c..a89e690e89 100644 --- a/include/effects/SkMergeImageFilter.h +++ b/include/effects/SkMergeImageFilter.h @@ -21,21 +21,6 @@ public: static sk_sp<SkImageFilter> MakeN(sk_sp<SkImageFilter>[], int count, const SkBlendMode[], const CropRect* cropRect = nullptr); -#ifdef SK_SUPPORT_LEGACY_XFERMODE_PARAM - static sk_sp<SkImageFilter> Make(sk_sp<SkImageFilter> first, sk_sp<SkImageFilter> second, - SkXfermode::Mode mode = SkXfermode::kSrcOver_Mode, - const CropRect* cropRect = nullptr) { - return Make(first, second, (SkBlendMode)mode, cropRect); - } - static sk_sp<SkImageFilter> Make(sk_sp<SkImageFilter> filters[], - int count, - const SkXfermode::Mode modes[] = nullptr, - const CropRect* cropRect = nullptr) { - static_assert(sizeof(SkXfermode::Mode) == sizeof(SkBlendMode), "size mismatch"); - return MakeN(filters, count, (const SkBlendMode*)modes, cropRect); - } -#endif - SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMergeImageFilter) |