Image filters: fix crop rect application in SkXfermodeImageFilter.

src/effects/SkXfermodeImageFilter.cpp

Index: src/effects/SkXfermodeImageFilter.cpp
diff --git a/src/effects/SkXfermodeImageFilter.cpp b/src/effects/SkXfermodeImageFilter.cpp
index 8cd75127baadfa21d3fd57bcc58bca8c9dfdc23e..0bfa8f54de0fce2489fb41e16a881856d2ca6e51 100644
--- a/src/effects/SkXfermodeImageFilter.cpp
+++ b/src/effects/SkXfermodeImageFilter.cpp
@@ -64,21 +64,11 @@ bool SkXfermodeImageFilter::onFilterImageDeprecated(Proxy* proxy,
         foreground.reset();
     }
 

[robertphillips, 2016/03/31 14:44:39]

overlength line

[Stephen White, 2016/03/31 15:18:17]

Fixed.

-    SkIRect bounds, foregroundBounds;
-    SkIRect foregroundSrcBounds = foreground.bounds();
-    foregroundSrcBounds.offset(foregroundOffset);
-    if (!applyCropRect(ctx, foregroundSrcBounds, &foregroundBounds)) {
-        foregroundBounds.setEmpty();
-        foreground.reset();
-    }
-    SkIRect backgroundSrcBounds = background.bounds();
-    backgroundSrcBounds.offset(backgroundOffset);
-    if (!applyCropRect(ctx, backgroundSrcBounds, &bounds)) {
-        bounds.setEmpty();
-        background.reset();
-    }
-    bounds.join(foregroundBounds);
-    if (bounds.isEmpty()) {
+    SkIRect foregroundBounds = foreground.bounds().makeOffset(foregroundOffset.x(), foregroundOffset.y());
+    SkIRect srcBounds = background.bounds().makeOffset(backgroundOffset.x(), backgroundOffset.y());
+    srcBounds.join(foregroundBounds);
+    SkIRect bounds;
+    if (!this->applyCropRect(ctx, srcBounds, &bounds)) {
         return false;
     }