| Index: src/effects/SkTestImageFilters.cpp
|
| diff --git a/src/effects/SkTestImageFilters.cpp b/src/effects/SkTestImageFilters.cpp
|
| index 9af61c8cbfca251f3a19a07fdcdbc3d99400ed66..a919dedd415e8be011e58c00caf58640de5d8197 100755
|
| --- a/src/effects/SkTestImageFilters.cpp
|
| +++ b/src/effects/SkTestImageFilters.cpp
|
| @@ -20,54 +20,6 @@ public:
|
|
|
| ///////////////////////////////////////////////////////////////////////////////
|
|
|
| -SkComposeImageFilter::~SkComposeImageFilter() {
|
| -}
|
| -
|
| -bool SkComposeImageFilter::onFilterImage(Proxy* proxy,
|
| - const SkBitmap& src,
|
| - const SkMatrix& ctm,
|
| - SkBitmap* result,
|
| - SkIPoint* loc) {
|
| - SkImageFilter* outer = getInput(0);
|
| - SkImageFilter* inner = getInput(1);
|
| -
|
| - if (!outer && !inner) {
|
| - return false;
|
| - }
|
| -
|
| - if (!outer || !inner) {
|
| - return (outer ? outer : inner)->filterImage(proxy, src, ctm, result, loc);
|
| - }
|
| -
|
| - SkBitmap tmp;
|
| - return inner->filterImage(proxy, src, ctm, &tmp, loc) &&
|
| - outer->filterImage(proxy, tmp, ctm, result, loc);
|
| -}
|
| -
|
| -bool SkComposeImageFilter::onFilterBounds(const SkIRect& src,
|
| - const SkMatrix& ctm,
|
| - SkIRect* dst) {
|
| - SkImageFilter* outer = getInput(0);
|
| - SkImageFilter* inner = getInput(1);
|
| -
|
| - if (!outer && !inner) {
|
| - return false;
|
| - }
|
| -
|
| - if (!outer || !inner) {
|
| - return (outer ? outer : inner)->filterBounds(src, ctm, dst);
|
| - }
|
| -
|
| - SkIRect tmp;
|
| - return inner->filterBounds(src, ctm, &tmp) &&
|
| - outer->filterBounds(tmp, ctm, dst);
|
| -}
|
| -
|
| -SkComposeImageFilter::SkComposeImageFilter(SkFlattenableReadBuffer& buffer) : INHERITED(buffer) {
|
| -}
|
| -
|
| -///////////////////////////////////////////////////////////////////////////////
|
| -
|
| bool SkDownSampleImageFilter::onFilterImage(Proxy* proxy, const SkBitmap& src,
|
| const SkMatrix&,
|
| SkBitmap* result, SkIPoint*) {
|
|
|