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/utils/SkNWayCanvas.cpp

diff --git a/src/utils/SkNWayCanvas.cpp b/src/utils/SkNWayCanvas.cpp
index 706c769..0efc98c 100644
--- a/src/utils/SkNWayCanvas.cpp
+++ b/src/utils/SkNWayCanvas.cpp
@@ -193,7 +193,7 @@
 }
 
 void SkNWayCanvas::onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src, const SkRect& dst,
-                                    const SkPaint* paint, SK_VIRTUAL_CONSTRAINT_TYPE constraint) {
+                                    const SkPaint* paint, SrcRectConstraint constraint) {
     Iter iter(fList);
     while (iter.next()) {
         iter->drawBitmapRect(bitmap, src, dst, paint, (SrcRectConstraint)constraint);
@@ -217,10 +217,10 @@
 }
 
 void SkNWayCanvas::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
-                                   const SkPaint* paint SRC_RECT_CONSTRAINT_PARAM(constraint)) {
+                                   const SkPaint* paint, SrcRectConstraint constraint) {
     Iter iter(fList);
     while (iter.next()) {
-        iter->drawImageRect(image, src, dst, paint SRC_RECT_CONSTRAINT_ARG(constraint));
+        iter->drawImageRect(image, src, dst, paint, constraint);
     }
 }