Add crop rect support for SkDisplacementMapEffect (raster and GPU paths).

gm/displacement.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkDisplacementMapEffect.h"
 #include "SkBitmapSource.h"
@@ skipping 42 matching lines @@
             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();
           }
         }
     }
 
     virtual SkISize onISize() {
-        return make_isize(500, 200);
+        return make_isize(500, 400);
     }
 
     void drawClippedBitmap(SkCanvas* canvas, int x, int y, const SkPaint& paint) {
         canvas->save();
-        canvas->clipRect(SkRect::MakeXYWH(SkIntToScalar(x), SkIntToScalar(y),
-            SkIntToScalar(fBitmap.width()), SkIntToScalar(fBitmap.height())));
-        canvas->drawBitmap(fBitmap, SkIntToScalar(x), SkIntToScalar(y), &paint);
+        canvas->translate(x, y);
+        canvas->clipRect(SkRect::MakeWH(SkIntToScalar(fBitmap.width()), SkIntToScalar(fBitmap.height())));
+        canvas->drawBitmap(fBitmap, 0, 0, &paint);
         canvas->restore();
     }
 
     virtual void onDraw(SkCanvas* canvas) {
         if (!fInitialized) {
             make_bitmap();
             make_checkerboard();
             fInitialized = true;
         }
         canvas->clear(0x00000000);
@@ skipping 33 matching lines @@
              SkDisplacementMapEffect::kB_ChannelSelectorType, 40.0f, displ)))->unref();
         drawClippedBitmap(canvas, 200, 100, paint);
         paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
             (SkDisplacementMapEffect::kG_ChannelSelectorType,
              SkDisplacementMapEffect::kA_ChannelSelectorType, 40.0f, displ)))->unref();
         drawClippedBitmap(canvas, 300, 100, paint);
         paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
             (SkDisplacementMapEffect::kR_ChannelSelectorType,
              SkDisplacementMapEffect::kA_ChannelSelectorType, 40.0f, displ)))->unref();
         drawClippedBitmap(canvas, 400, 100, paint);
+
+        SkImageFilter::CropRect cropRect(SkRect::MakeXYWH(30, 30, 40, 40));
+        paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
+            (SkDisplacementMapEffect::kR_ChannelSelectorType,
+             SkDisplacementMapEffect::kG_ChannelSelectorType,
+             0.0f, displ, NULL, &cropRect)))->unref();
+        drawClippedBitmap(canvas, 0, 200, paint);
+        paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
+            (SkDisplacementMapEffect::kB_ChannelSelectorType,
+             SkDisplacementMapEffect::kA_ChannelSelectorType,
+             16.0f, displ, NULL, &cropRect)))->unref();
+        drawClippedBitmap(canvas, 100, 200, paint);
+        paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
+            (SkDisplacementMapEffect::kR_ChannelSelectorType,
+             SkDisplacementMapEffect::kB_ChannelSelectorType,
+             32.0f, displ, NULL, &cropRect)))->unref();
+        drawClippedBitmap(canvas, 200, 200, paint);
+        paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
+            (SkDisplacementMapEffect::kG_ChannelSelectorType,
+             SkDisplacementMapEffect::kA_ChannelSelectorType,
+             48.0f, displ, NULL, &cropRect)))->unref();
+        drawClippedBitmap(canvas, 300, 200, paint);
+        paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
+            (SkDisplacementMapEffect::kR_ChannelSelectorType,
+             SkDisplacementMapEffect::kA_ChannelSelectorType,
+             64.0f, displ, NULL, &cropRect)))->unref();
+        drawClippedBitmap(canvas, 400, 200, paint);
+
+        paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
+            (SkDisplacementMapEffect::kR_ChannelSelectorType,
+             SkDisplacementMapEffect::kG_ChannelSelectorType,
+             40.0f, displ, NULL, &cropRect)))->unref();
+        drawClippedBitmap(canvas, 0, 300, paint);
+        paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
+            (SkDisplacementMapEffect::kB_ChannelSelectorType,
+             SkDisplacementMapEffect::kA_ChannelSelectorType,
+             40.0f, displ, NULL, &cropRect)))->unref();
+        drawClippedBitmap(canvas, 100, 300, paint);
+        paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
+            (SkDisplacementMapEffect::kR_ChannelSelectorType,
+             SkDisplacementMapEffect::kB_ChannelSelectorType,
+             40.0f, displ, NULL, &cropRect)))->unref();
+        drawClippedBitmap(canvas, 200, 300, paint);
+        paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
+            (SkDisplacementMapEffect::kG_ChannelSelectorType,
+             SkDisplacementMapEffect::kA_ChannelSelectorType,
+             40.0f, displ, NULL, &cropRect)))->unref();
+        drawClippedBitmap(canvas, 300, 300, paint);
+        paint.setImageFilter(SkNEW_ARGS(SkDisplacementMapEffect,
+            (SkDisplacementMapEffect::kR_ChannelSelectorType,
+             SkDisplacementMapEffect::kA_ChannelSelectorType,
+             40.0f, displ, NULL, &cropRect)))->unref();
+        drawClippedBitmap(canvas, 400, 300, paint);
     }
 
 private:
     typedef GM INHERITED;
     SkBitmap fBitmap, fCheckerboard;
     bool fInitialized;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static GM* MyFactory(void*) { return new DisplacementMapGM; }
 static GMRegistry reg(MyFactory);
 
 }