Image filters: fix crop rect application in SkXfermodeImageFilter.

src/effects/SkXfermodeImageFilter.cpp

 /*
  * Copyright 2013 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkXfermodeImageFilter.h"
 #include "SkCanvas.h"
 #include "SkDevice.h"
@@ skipping 45 matching lines @@
                                                     SkIPoint* offset) const {
     SkBitmap background = src, foreground = src;
     SkIPoint backgroundOffset = SkIPoint::Make(0, 0);
     if (!this->filterInputDeprecated(0, proxy, src, ctx, &background, &backgroundOffset)) {
         background.reset();
     }
     SkIPoint foregroundOffset = SkIPoint::Make(0, 0);
     if (!this->filterInputDeprecated(1, proxy, src, ctx, &foreground, &foregroundOffset)) {
         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;
     }
 
     SkAutoTUnref<SkBaseDevice> device(proxy->createDevice(bounds.width(), bounds.height()));
     if (nullptr == device.get()) {
         return false;
     }
     SkCanvas canvas(device);
     canvas.translate(SkIntToScalar(-bounds.left()), SkIntToScalar(-bounds.top()));
     SkPaint paint;
@@ skipping 156 matching lines @@
     matrix.setTranslate(SkIntToScalar(-bounds.left()), SkIntToScalar(-bounds.top()));
     drawContext->drawRect(GrClip::WideOpen(), paint, matrix, SkRect::Make(bounds));
 
     offset->fX = bounds.left();
     offset->fY = bounds.top();
     GrWrapTextureInBitmap(dst, bounds.width(), bounds.height(), false, result);
     return true;
 }
 
 #endif