commit 29089179a66c06ef70da387111af75970f04ed53
author senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Mar 14 16:48:39 2014 +0000
committer senorblanco@chromium.org <senorblanco@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Fri Mar 14 16:48:39 2014 +0000
tree 82b92dd3dbea630b3b64a55a66a4b501fd59f3fa
parent 0ef0501baf615149d6d84398d7594cd89f6e928d

Revert "Implement support for expanding crop rects in image filters"

Breaking ImageFilterTests unit test.

TBR=bsalomon@google.com
BUG=skia:

Review URL: https://codereview.chromium.org/196353021

git-svn-id: http://skia.googlecode.com/svn/trunk@13806 2bbb7eff-a529-9590-31e7-b0007b416f81

src/effects/SkXfermodeImageFilter.cpp

diff --git a/src/effects/SkXfermodeImageFilter.cpp b/src/effects/SkXfermodeImageFilter.cpp
index 901353f..ebfd16c 100644
--- a/src/effects/SkXfermodeImageFilter.cpp
+++ b/src/effects/SkXfermodeImageFilter.cpp
@@ -62,13 +62,14 @@
     }
 
     SkIRect bounds, foregroundBounds;
-    if (!applyCropRect(ctx, foreground, foregroundOffset, &foregroundBounds)) {
-        return false;
-    }
-    if (!applyCropRect(ctx, background, backgroundOffset, &bounds)) {
-        return false;
-    }
+    background.getBounds(&bounds);
+    bounds.offset(backgroundOffset);
+    foreground.getBounds(&foregroundBounds);
+    foregroundBounds.offset(foregroundOffset);
     bounds.join(foregroundBounds);
+    if (!applyCropRect(&bounds, ctx.ctm())) {
+        return false;
+    }
 
     SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
     if (NULL == device.get()) {