commit 562fe4767cc73e08a4e039362bc0336aea66ecfb
author reed <reed@google.com> Tue Jul 28 07:35:14 2015 -0700
committer Commit bot <commit-bot@chromium.org> Tue Jul 28 07:35:14 2015 -0700
tree 02244ec3279fa16de377f53a7dddce993971048a
parent 91f283bb4e6ea71bbd4e6efc27befc29118ee543

remove all guards for changes to drawBitmapRect / drawImageRect

BUG=skia:

Review URL: https://codereview.chromium.org/1239193002

src/core/SkPictureRecord.cpp

diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp
index 60996db..0383dda 100644
--- a/src/core/SkPictureRecord.cpp
+++ b/src/core/SkPictureRecord.cpp
@@ -552,8 +552,7 @@
 }
 
 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::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) {