aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Mike Reed <reed@google.com>2017-06-18 22:46:15 -0400
committerGravatar Skia Commit-Bot <skia-commit-bot@chromium.org>2017-06-19 03:12:07 +0000
commitce6b4b004b2842e61cd9f86ebb75d1872044b382 (patch)
tree97c3db6a9ae358b9968bfd83005750eda201191d
parentab51d1b297e6ce19347c6f6cb86808e0495a86ff (diff)
imagefilters should take const array
Bug: skia: Change-Id: I6f069c843ab27b41c4d1e87f76130e2ba2daf048 Reviewed-on: https://skia-review.googlesource.com/20211 Reviewed-by: Mike Reed <reed@google.com> Commit-Queue: Mike Reed <reed@google.com>
-rw-r--r--include/core/SkImageFilter.h4
-rw-r--r--src/core/SkImageFilter.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/include/core/SkImageFilter.h b/include/core/SkImageFilter.h
index a6ade97b1f..7999a95e41 100644
--- a/include/core/SkImageFilter.h
+++ b/include/core/SkImageFilter.h
@@ -269,7 +269,7 @@ protected:
void allocInputs(int count);
};
- SkImageFilter(sk_sp<SkImageFilter>* inputs, int inputCount, const CropRect* cropRect);
+ SkImageFilter(sk_sp<SkImageFilter> const* inputs, int inputCount, const CropRect* cropRect);
~SkImageFilter() override;
@@ -435,7 +435,7 @@ private:
static void PurgeCache();
- void init(sk_sp<SkImageFilter>* inputs, int inputCount, const CropRect* cropRect);
+ void init(sk_sp<SkImageFilter> const* inputs, int inputCount, const CropRect* cropRect);
bool usesSrcInput() const { return fUsesSrcInput; }
virtual bool affectsTransparentBlack() const { return false; }
diff --git a/src/core/SkImageFilter.cpp b/src/core/SkImageFilter.cpp
index 453bcfda98..3c3aa18056 100644
--- a/src/core/SkImageFilter.cpp
+++ b/src/core/SkImageFilter.cpp
@@ -145,7 +145,7 @@ bool SkImageFilter::Common::unflatten(SkReadBuffer& buffer, int expectedCount) {
///////////////////////////////////////////////////////////////////////////////////////////////////
-void SkImageFilter::init(sk_sp<SkImageFilter>* inputs,
+void SkImageFilter::init(sk_sp<SkImageFilter> const* inputs,
int inputCount,
const CropRect* cropRect) {
fCropRect = cropRect ? *cropRect : CropRect(SkRect(), 0x0);
@@ -160,7 +160,7 @@ void SkImageFilter::init(sk_sp<SkImageFilter>* inputs,
}
}
-SkImageFilter::SkImageFilter(sk_sp<SkImageFilter>* inputs,
+SkImageFilter::SkImageFilter(sk_sp<SkImageFilter> const* inputs,
int inputCount,
const CropRect* cropRect)
: fUsesSrcInput(false)