remove all guards for changes to drawBitmapRect / drawImageRect

src/utils/SkDumpCanvas.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDumpCanvas.h"
 
@@ skipping 328 matching lines @@
 
 void SkDumpCanvas::onDrawBitmap(const SkBitmap& bitmap, SkScalar x, SkScalar y,
                                 const SkPaint* paint) {
     SkString str;
     bitmap.toString(&str);
     this->dump(kDrawBitmap_Verb, paint, "drawBitmap(%s %g %g)", str.c_str(),
                SkScalarToFloat(x), SkScalarToFloat(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);
     // show the src-rect only if its not everything
     if (src && (src->fLeft > 0 || src->fTop > 0 ||
                 src->fRight < SkIntToScalar(bitmap.width()) ||
                 src->fBottom < SkIntToScalar(bitmap.height()))) {
         SkString ss;
         toString(*src, &ss);
         rs.prependf("%s ", ss.c_str());
@@ skipping 13 matching lines @@
 }
 
 void SkDumpCanvas::onDrawImage(const SkImage* image, SkScalar x, SkScalar y, const SkPaint* paint) {
     SkString str;
     image->toString(&str);
     this->dump(kDrawBitmap_Verb, paint, "drawImage(%s %g %g)", str.c_str(),
                SkScalarToFloat(x), SkScalarToFloat(y));
 }
 
 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);
     // show the src-rect only if its not everything
     if (src && (src->fLeft > 0 || src->fTop > 0 ||
                 src->fRight < SkIntToScalar(image->width()) ||
                 src->fBottom < SkIntToScalar(image->height()))) {
         SkString ss;
         toString(*src, &ss);
         rs.prependf("%s ", ss.c_str());
@@ skipping 154 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static void dumpToDebugf(const char text[], void*) {
     SkDebugf("%s\n", text);
 }
 
 SkDebugfDumper::SkDebugfDumper() : INHERITED(dumpToDebugf, NULL) {}
 
 #endif