aboutsummaryrefslogtreecommitdiffhomepage
path: root/include/effects
diff options
context:
space:
mode:
authorGravatar Hal Canary <halcanary@google.com>2017-06-20 15:40:39 +0000
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-06-20 15:40:46 +0000
commit012bdf8cb526ec27b50cf7bb80ed4041c0cfb864 (patch)
treef0d024b06f7fe7bcb6aef82807d4b00399b076e1 /include/effects
parent29e6f3182bee441d4d70bb996ca6ac075511bbfe (diff)
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>
Diffstat (limited to 'include/effects')
-rw-r--r--include/effects/SkMergeImageFilter.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/effects/SkMergeImageFilter.h b/include/effects/SkMergeImageFilter.h
index fdb5c1f6cc..679336103f 100644
--- a/include/effects/SkMergeImageFilter.h
+++ b/include/effects/SkMergeImageFilter.h
@@ -24,6 +24,12 @@ 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)