Make SkImageFilter crop rects relative to the primitive origin, instead of relative to their parent

src/effects/SkMorphologyImageFilter.cpp

 /*
  * Copyright 2012 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 "SkMorphologyImageFilter.h"
 #include "SkBitmap.h"
 #include "SkColorPriv.h"
@@ skipping 149 matching lines @@
     }
     dilateYProc(src.getAddr32(bounds.left(), bounds.top()), dst->getAddr32(0, 0),
                 radiusY, bounds.height(), bounds.width(),
                 src.rowBytesAsPixels(), dst->rowBytesAsPixels());
 }
 
 bool SkErodeImageFilter::onFilterImage(Proxy* proxy,
                                        const SkBitmap& source, const SkMatrix& ctm,
                                        SkBitmap* dst, SkIPoint* offset) {
     SkBitmap src = source;
-    if (getInput(0) && !getInput(0)->filterImage(proxy, source, ctm, &src, offset)) {
+    SkIPoint srcOffset = SkIPoint::Make(0, 0);
+    if (getInput(0) && !getInput(0)->filterImage(proxy, source, ctm, &src, &srcOffset)) {
         return false;
     }
 
     if (src.config() != SkBitmap::kARGB_8888_Config) {
         return false;
     }
 
     SkIRect bounds;
     src.getBounds(&bounds);
+    bounds.offset(srcOffset);
     if (!this->applyCropRect(&bounds, ctm)) {
         return false;
     }
 
     SkAutoLockPixels alp(src);
     if (!src.getPixels()) {
         return false;
     }
 
     dst->setConfig(src.config(), bounds.width(), bounds.height());
     dst->allocPixels();
     if (!dst->getPixels()) {
         return false;
     }
 
     int width = radius().width();
     int height = radius().height();
 
     if (width < 0 || height < 0) {
         return false;
     }
 
     if (width == 0 && height == 0) {
         src.extractSubset(dst, bounds);
-        offset->fX += bounds.left();
-        offset->fY += bounds.top();
+        offset->fX = bounds.left();
+        offset->fY = bounds.top();
         return true;
     }
 
     SkBitmap temp;
     temp.setConfig(dst->config(), dst->width(), dst->height());
     if (!temp.allocPixels()) {
         return false;
     }
 
+    offset->fX = bounds.left();
+    offset->fY = bounds.top();
+    bounds.offset(-srcOffset);
     if (width > 0 && height > 0) {
         erodeX(src, &temp, width, bounds);
         SkIRect tmpBounds = SkIRect::MakeWH(bounds.width(), bounds.height());
         erodeY(temp, dst, height, tmpBounds);
     } else if (width > 0) {
         erodeX(src, dst, width, bounds);
     } else if (height > 0) {
         erodeY(src, dst, height, bounds);
     }
-    offset->fX += bounds.left();
-    offset->fY += bounds.top();
     return true;
 }
 
 bool SkDilateImageFilter::onFilterImage(Proxy* proxy,
                                         const SkBitmap& source, const SkMatrix& ctm,
                                         SkBitmap* dst, SkIPoint* offset) {
     SkBitmap src = source;
-    if (getInput(0) && !getInput(0)->filterImage(proxy, source, ctm, &src, offset)) {
+    SkIPoint srcOffset = SkIPoint::Make(0, 0);
+    if (getInput(0) && !getInput(0)->filterImage(proxy, source, ctm, &src, &srcOffset)) {
         return false;
     }
     if (src.config() != SkBitmap::kARGB_8888_Config) {
         return false;
     }
 
     SkIRect bounds;
     src.getBounds(&bounds);
+    bounds.offset(srcOffset);
     if (!this->applyCropRect(&bounds, ctm)) {
         return false;
     }
 
     SkAutoLockPixels alp(src);
     if (!src.getPixels()) {
         return false;
     }
 
     dst->setConfig(src.config(), bounds.width(), bounds.height());
     dst->allocPixels();
     if (!dst->getPixels()) {
         return false;
     }
 
     int width = radius().width();
     int height = radius().height();
 
     if (width < 0 || height < 0) {
         return false;
     }
 
     if (width == 0 && height == 0) {
         src.extractSubset(dst, bounds);
-        offset->fX += bounds.left();
-        offset->fY += bounds.top();
+        offset->fX = bounds.left();
+        offset->fY = bounds.top();
         return true;
     }
 
     SkBitmap temp;
     temp.setConfig(dst->config(), dst->width(), dst->height());
     if (!temp.allocPixels()) {
         return false;
     }
 
+    offset->fX = bounds.left();
+    offset->fY = bounds.top();
+    bounds.offset(-srcOffset);
     if (width > 0 && height > 0) {
         dilateX(src, &temp, width, bounds);
         SkIRect tmpBounds = SkIRect::MakeWH(bounds.width(), bounds.height());
         dilateY(temp, dst, height, tmpBounds);
     } else if (width > 0) {
         dilateX(src, dst, width, bounds);
     } else if (height > 0) {
         dilateY(src, dst, height, bounds);
     }
-    offset->fX += bounds.left();
-    offset->fY += bounds.top();
     return true;
 }
 
 #if SK_SUPPORT_GPU
 
 ///////////////////////////////////////////////////////////////////////////////
 
 class GrGLMorphologyEffect;
 
 /**
@@ skipping 275 matching lines @@
     }
     int width = radius().width();
     int height = radius().height();
 
     if (width < 0 || height < 0) {
         return false;
     }
 
     if (width == 0 && height == 0) {
         src.extractSubset(result, bounds);
-        offset->fX += bounds.left();
-        offset->fY += bounds.top();
+        offset->fX = bounds.left();
+        offset->fY = bounds.top();
         return true;
     }
 
     if (!apply_morphology(input, bounds, GrMorphologyEffect::kDilate_MorphologyType, radius(), result)) {
         return false;
     }
-    offset->fX += bounds.left();
-    offset->fY += bounds.top();
+    offset->fX = bounds.left();
+    offset->fY = bounds.top();
     return true;
 }
 
 bool SkErodeImageFilter::filterImageGPU(Proxy* proxy, const SkBitmap& src, const SkMatrix& ctm,
                                         SkBitmap* result, SkIPoint* offset) {
     SkBitmap input;
     if (!SkImageFilterUtils::GetInputResultGPU(getInput(0), proxy, src, ctm, &input, offset)) {
         return false;
     }
     SkIRect bounds;
     src.getBounds(&bounds);
     if (!this->applyCropRect(&bounds, ctm)) {
         return false;
     }
     int width = radius().width();
     int height = radius().height();
 
     if (width < 0 || height < 0) {
         return false;
     }
 
     if (width == 0 && height == 0) {
         src.extractSubset(result, bounds);
-        offset->fX += bounds.left();
-        offset->fY += bounds.top();
+        offset->fX = bounds.left();
+        offset->fY = bounds.top();
         return true;
     }
 
     if (!apply_morphology(input, bounds, GrMorphologyEffect::kErode_MorphologyType, radius(), result)) {
         return false;
     }
-    offset->fX += bounds.left();
-    offset->fY += bounds.top();
+    offset->fX = bounds.left();
+    offset->fY = bounds.top();
     return true;
 }
 
 #endif