aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/effects/SkXfermodeImageFilter.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/effects/SkXfermodeImageFilter.cpp')
-rw-r--r--src/effects/SkXfermodeImageFilter.cpp22
1 files changed, 7 insertions, 15 deletions
diff --git a/src/effects/SkXfermodeImageFilter.cpp b/src/effects/SkXfermodeImageFilter.cpp
index 3b186039d0..db0b5e59bb 100644
--- a/src/effects/SkXfermodeImageFilter.cpp
+++ b/src/effects/SkXfermodeImageFilter.cpp
@@ -64,21 +64,13 @@ bool SkXfermodeImageFilter::onFilterImageDeprecated(Proxy* proxy,
foreground.reset();
}
- 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();
+ foregroundBounds.offset(foregroundOffset);
+ SkIRect srcBounds = background.bounds();
+ srcBounds.offset(backgroundOffset);
+ srcBounds.join(foregroundBounds);
+ SkIRect bounds;
+ if (!this->applyCropRect(ctx, srcBounds, &bounds)) {
return false;
}