From 012bdf8cb526ec27b50cf7bb80ed4041c0cfb864 Mon Sep 17 00:00:00 2001 From: Hal Canary Date: Tue, 20 Jun 2017 15:40:39 +0000 Subject: 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 > Commit-Queue: Mike Reed 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 Commit-Queue: Hal Canary --- include/effects/SkMergeImageFilter.h | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'include') 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 MakeN(sk_sp 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) -- cgit v1.2.3