remove all guards for changes to drawBitmapRect / drawImageRect

src/utils/SkDumpCanvas.cpp

Index: src/utils/SkDumpCanvas.cpp
diff --git a/src/utils/SkDumpCanvas.cpp b/src/utils/SkDumpCanvas.cpp
index e20aea4e02372fccbe1b81b9ba33003174936228..e8997ab573c240eda9d85be21f8a9fd9e0570710 100644
--- a/src/utils/SkDumpCanvas.cpp
+++ b/src/utils/SkDumpCanvas.cpp
@@ -346,7 +346,7 @@ void SkDumpCanvas::onDrawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y,
 }
 
 void SkDumpCanvas::onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
-                                    const SkPaint* paint, SK_VIRTUAL_CONSTRAINT_TYPE) {
+                                    const SkPaint* paint, SrcRectConstraint) {
     SkString bs, rs;
     bitmap.toString(&bs);
     toString(dst, &rs);
@@ -380,7 +380,7 @@ void SkDumpCanvas::onDrawImage(const SkImage* image, SkScalar x, SkScalar y, con
 }
 
 void SkDumpCanvas::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
-                                   const SkPaint* paint SRC_RECT_CONSTRAINT_PARAM(constraint)) {
+                                   const SkPaint* paint, SrcRectConstraint) {
     SkString bs, rs;
     image->toString(&bs);
     toString(dst, &rs);