remove all guards for changes to drawBitmapRect / drawImageRect

src/utils/SkPaintFilterCanvas.cpp

Index: src/utils/SkPaintFilterCanvas.cpp
diff --git a/src/utils/SkPaintFilterCanvas.cpp b/src/utils/SkPaintFilterCanvas.cpp
index 3e589e6146151e925c43c0967e955fe82787e9c6..0ff6ae04d1f43de051c7c511d53c3e8bac62873e 100644
--- a/src/utils/SkPaintFilterCanvas.cpp
+++ b/src/utils/SkPaintFilterCanvas.cpp
@@ -74,8 +74,7 @@ void SkPaintFilterCanvas::onDrawBitmap(const SkBitmap& bm, SkScalar left, SkScal
 }
 
 void SkPaintFilterCanvas::onDrawBitmapRect(const SkBitmap& bm, const SkRect* src, const SkRect& dst,
-                                           const SkPaint* paint,
-                                           SK_VIRTUAL_CONSTRAINT_TYPE constraint) {
+                                           const SkPaint* paint, SrcRectConstraint constraint) {
     AutoPaintFilter apf(this, kBitmap_Type, paint);
     this->INHERITED::onDrawBitmapRect(bm, src, dst, apf.paint(), constraint);
 }
@@ -87,11 +86,10 @@ void SkPaintFilterCanvas::onDrawImage(const SkImage* image, SkScalar left, SkSca
 }
 
 void SkPaintFilterCanvas::onDrawImageRect(const SkImage* image, const SkRect* src,
-                                          const SkRect& dst, const SkPaint* paint
-                                          SRC_RECT_CONSTRAINT_PARAM(constraint)) {
+                                          const SkRect& dst, const SkPaint* paint,
+                                          SrcRectConstraint constraint) {
     AutoPaintFilter apf(this, kBitmap_Type, paint);
-    this->INHERITED::onDrawImageRect(image, src, dst, apf.paint()
-                                     SRC_RECT_CONSTRAINT_ARG(constraint));
+    this->INHERITED::onDrawImageRect(image, src, dst, apf.paint(), constraint);
 }
 
 void SkPaintFilterCanvas::onDrawBitmapNine(const SkBitmap& bm, const SkIRect& center,