diff options
| author |  Mike Reed <reed@google.com> | 2017-06-20 17:26:04 +0000 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-06-20 17:26:09 +0000 |
| commit | 8051c4f22c19158b049877d4187ebe5317fedfde (patch) | |
| tree | 46ff42504a6885a8885f932c9bbfaeb2fef0f2ac /include/effects/SkMergeImageFilter.h | |
| parent | 012bdf8cb526ec27b50cf7bb80ed4041c0cfb864 (diff) | |
Revert "Revert "remove unused api""
This reverts commit 012bdf8cb526ec27b50cf7bb80ed4041c0cfb864.
Reason for revert: google3 updated
Original change's description:
> Revert "remove unused api"
>
> This reverts commit 151b6ff29593093e409f7f4f24129a6f7fde2467.
>
> Reason for revert: broke google3
>
> Original change's description:
> > remove unused api
> >
> > Needs this to land first
> > https://codereview.chromium.org/2945973002/
> >
> > Bug: skia:
> > Change-Id: Ib5db8a528cdf9fd75c7a547a5fc637da7a4bbce0
> > Reviewed-on: https://skia-review.googlesource.com/20304
> > Reviewed-by: Mike Reed <reed@google.com>
> > Commit-Queue: Mike Reed <reed@google.com>
>
> TBR=reed@google.com
>
> Change-Id: If37bbf75eec6415639c65163d3a574554c3fa232
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:
> Reviewed-on: https://skia-review.googlesource.com/20324
> Reviewed-by: Hal Canary <halcanary@google.com>
> Commit-Queue: Hal Canary <halcanary@google.com>
TBR=halcanary@google.com,reed@google.com
Change-Id: I082ace66ad9e04548273e9f7d9b86539a71941c1
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:
Reviewed-on: https://skia-review.googlesource.com/20311
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 | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h index 679336103f..fdb5c1f6cc 100644 --- a/include/effects/SkMergeImageFilter.h +++ b/include/effects/SkMergeImageFilter.h @@ -24,12 +24,6 @@ public: return Make(array, 2, cropRect); } - // Change caller in chrome to use Make(...) instead - static sk_sp<SkImageFilter> MakeN(sk_sp<SkImageFilter> array[], int count, std::nullptr_t, - const CropRect* cropRect = nullptr) { - return Make(array, count, cropRect); - } - SK_TO_STRING_OVERRIDE() SK_DECLARE_PUBLIC_FLATTENABLE_DESERIALIZATION_PROCS(SkMergeImageFilter) |