| Index: src/effects/SkMergeImageFilter.cpp
|
| diff --git a/src/effects/SkMergeImageFilter.cpp b/src/effects/SkMergeImageFilter.cpp
|
| index 12fff9533a50b00651e1d967a14edec61db1c4e9..79e5329ef1455e0c5d57cd0512db5de956ff6a71 100755
|
| --- a/src/effects/SkMergeImageFilter.cpp
|
| +++ b/src/effects/SkMergeImageFilter.cpp
|
| @@ -55,9 +55,9 @@ SkMergeImageFilter::~SkMergeImageFilter() {
|
| }
|
| }
|
|
|
| -bool SkMergeImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src,
|
| - const Context& ctx,
|
| - SkBitmap* result, SkIPoint* offset) const {
|
| +bool SkMergeImageFilter::onFilterImageDeprecated(Proxy* proxy, const SkBitmap& src,
|
| + const Context& ctx,
|
| + SkBitmap* result, SkIPoint* offset) const {
|
| int inputCount = this->countInputs();
|
| if (inputCount < 1) {
|
| return false;
|
| @@ -73,7 +73,7 @@ bool SkMergeImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src,
|
| for (int i = 0; i < inputCount; ++i) {
|
| inputs[i] = src;
|
| offsets[i].setZero();
|
| - if (!this->filterInput(i, proxy, src, ctx, &inputs[i], &offsets[i])) {
|
| + if (!this->filterInputDeprecated(i, proxy, src, ctx, &inputs[i], &offsets[i])) {
|
| inputs[i].reset();
|
| continue;
|
| }
|
|
|