| Index: src/effects/SkMergeImageFilter.cpp
|
| diff --git a/src/effects/SkMergeImageFilter.cpp b/src/effects/SkMergeImageFilter.cpp
|
| index 086d8e68a1e14ad4b2baa29399e648981f24c98c..d0a153fa50e4769f6def6f87fb389daa3e0464ad 100755
|
| --- a/src/effects/SkMergeImageFilter.cpp
|
| +++ b/src/effects/SkMergeImageFilter.cpp
|
| @@ -65,38 +65,6 @@ SkMergeImageFilter::~SkMergeImageFilter() {
|
| }
|
| }
|
|
|
| -bool SkMergeImageFilter::onFilterBounds(const SkIRect& src, const SkMatrix& ctm,
|
| - SkIRect* dst) {
|
| - if (countInputs() < 1) {
|
| - return false;
|
| - }
|
| -
|
| - SkIRect totalBounds;
|
| -
|
| - int inputCount = countInputs();
|
| - for (int i = 0; i < inputCount; ++i) {
|
| - SkImageFilter* filter = getInput(i);
|
| - SkIRect r;
|
| - if (filter) {
|
| - if (!filter->filterBounds(src, ctm, &r)) {
|
| - return false;
|
| - }
|
| - } else {
|
| - r = src;
|
| - }
|
| - if (0 == i) {
|
| - totalBounds = r;
|
| - } else {
|
| - totalBounds.join(r);
|
| - }
|
| - }
|
| -
|
| - // don't modify dst until now, so we don't accidentally change it in the
|
| - // loop, but then return false on the next filter.
|
| - *dst = totalBounds;
|
| - return true;
|
| -}
|
| -
|
| bool SkMergeImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src,
|
| const SkMatrix& ctm,
|
| SkBitmap* result, SkIPoint* offset) {
|
|
|