Fix Morphology effects sourcing outside of the crop rect.

gm/imagefilterscropped.cpp

Index: gm/imagefilterscropped.cpp
diff --git a/gm/imagefilterscropped.cpp b/gm/imagefilterscropped.cpp
index e7d37901d814b4dab51bf8de80164f32587b6b2b..945a6c0b03e7720b766c4741cfb232e969750928 100644
--- a/gm/imagefilterscropped.cpp
+++ b/gm/imagefilterscropped.cpp
@@ -12,7 +12,9 @@
 #include "SkShader.h"
 
 #include "SkBlurImageFilter.h"
+#include "SkMorphologyImageFilter.h"
 #include "SkColorFilterImageFilter.h"
+#include "SkBitmapSource.h"
 #include "SkMergeImageFilter.h"
 #include "SkOffsetImageFilter.h"
 #include "SkTestImageFilters.h"
@@ -109,6 +111,27 @@ protected:
 
     virtual SkISize onISize() { return SkISize::Make(400, 640); }
 
+    void make_checkerboard() {
+        fCheckerboard.allocN32Pixels(80, 80);
+        SkCanvas canvas(fCheckerboard);
+        canvas.clear(0x00000000);

[Justin Novosad, 2014/12/22 20:11:11]

0 -> SK_ColorTRANSPARENT

[cwallez, 2015/01/19 21:34:38]

Done.

+        SkPaint darkPaint;
+        darkPaint.setColor(0xFF404040);
+        SkPaint lightPaint;
+        lightPaint.setColor(0xFFA0A0A0);
+        for (int y = 0; y < 80; y += 16) {
+            for (int x = 0; x < 80; x += 16) {
+                canvas.save();
+                canvas.translate(SkIntToScalar(x), SkIntToScalar(y));
+                canvas.drawRect(SkRect::MakeXYWH(0, 0, 8, 8), darkPaint);
+                canvas.drawRect(SkRect::MakeXYWH(8, 0, 8, 8), lightPaint);
+                canvas.drawRect(SkRect::MakeXYWH(0, 8, 8, 8), lightPaint);
+                canvas.drawRect(SkRect::MakeXYWH(8, 8, 8, 8), darkPaint);
+                canvas.restore();
+            }
+        }
+    }
+
     void draw_frame(SkCanvas* canvas, const SkRect& r) {
         SkPaint paint;
         paint.setStyle(SkPaint::kStroke_Style);
@@ -124,6 +147,10 @@ protected:
         return kSkipScaledReplay_Flag | kSkipTiled_Flag;
     }
 
+    virtual void onOnceBeforeDraw() SK_OVERRIDE{
+        make_checkerboard();
+    }
+
     virtual void onDraw(SkCanvas* canvas) {
         void (*drawProc[])(SkCanvas*, const SkRect&, SkImageFilter*) = {
             draw_sprite, draw_bitmap, draw_path, draw_paint, draw_text
@@ -138,16 +165,15 @@ protected:
             SkIntToScalar(-10), SkIntToScalar(-10)));
 
         SkAutoTUnref<SkImageFilter> cfOffset(SkColorFilterImageFilter::Create(cf.get(), offset.get()));
-
         SkImageFilter* filters[] = {
             NULL,
             SkColorFilterImageFilter::Create(cf.get(), NULL, &cropRect),
-            SkBlurImageFilter::Create(1.0f, 1.0f, NULL, &cropRect),
-            SkBlurImageFilter::Create(8.0f, 0.0f, NULL, &cropRect),
-            SkBlurImageFilter::Create(0.0f, 8.0f, NULL, &cropRect),
-            SkBlurImageFilter::Create(8.0f, 8.0f, NULL, &cropRect),
+            SkErodeImageFilter::Create(1, 1, NULL, &cropRect),
+            SkErodeImageFilter::Create(8, 0, SkErodeImageFilter::Create(0, 8, NULL, &cropRect), &cropRect),
+            SkErodeImageFilter::Create(0, 8, SkErodeImageFilter::Create(8, 0, NULL, &cropRect), &cropRect),
+            SkErodeImageFilter::Create(8, 8, NULL, &cropRect),
             SkMergeImageFilter::Create(NULL, cfOffset.get(), SkXfermode::kSrcOver_Mode, &cropRect),
-            SkBlurImageFilter::Create(8.0f, 8.0f, NULL, &bogusRect),
+            SkErodeImageFilter::Create(8, 8, NULL, &bogusRect),
             SkColorFilterImageFilter::Create(cf.get(), NULL, &bogusRect),
         };
 
@@ -160,6 +186,8 @@ protected:
         for (size_t j = 0; j < SK_ARRAY_COUNT(drawProc); ++j) {
             canvas->save();
             for (size_t i = 0; i < SK_ARRAY_COUNT(filters); ++i) {
+                SkPaint paint;
+                canvas->drawBitmap(fCheckerboard, 0, 0);
                 drawProc[j](canvas, r, filters[i]);
                 canvas->translate(0, DY);
             }
@@ -173,6 +201,7 @@ protected:
     }
 
 private:
+    SkBitmap fCheckerboard;
     typedef GM INHERITED;
 };