remove all guards for changes to drawBitmapRect / drawImageRect

src/core/SkPictureRecord.cpp

Index: src/core/SkPictureRecord.cpp
diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp
index 60996dbba407843cd3438e3cab516bd816fa6c87..0383dda3d519fe5ef38586eb2de9190b4782b555 100644
--- a/src/core/SkPictureRecord.cpp
+++ b/src/core/SkPictureRecord.cpp
@@ -552,8 +552,7 @@ void SkPictureRecord::onDrawBitmap(const SkBitmap& bitmap, SkScalar left, SkScal
 }
 
 void SkPictureRecord::onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
-                                       const SkPaint* paint,
-                                       SK_VIRTUAL_CONSTRAINT_TYPE constraint) {
+                                       const SkPaint* paint, SrcRectConstraint constraint) {
     // id + paint index + bitmap index + bool for 'src' + flags
     size_t size = 5 * kUInt32Size;
     if (src) {
@@ -585,8 +584,7 @@ void SkPictureRecord::onDrawImage(const SkImage* image, SkScalar x, SkScalar y,
 }
 
 void SkPictureRecord::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
-                                      const SkPaint* paint SRC_RECT_CONSTRAINT_PARAM(constraint)) {
-    SRC_RECT_CONSTRAINT_LOCAL_DEFAULT(constraint)
+                                      const SkPaint* paint, SrcRectConstraint constraint) {
     // id + paint_index + image_index + bool_for_src + constraint
     size_t size = 5 * kUInt32Size;
     if (src) {