remove all guards for changes to drawBitmapRect / drawImageRect

src/utils/SkPaintFilterCanvas.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkPaintFilterCanvas.h"
 
 #include "SkPaint.h"
@@ skipping 56 matching lines @@
     this->INHERITED::onDrawPath(path, *apf.paint());
 }
 
 void SkPaintFilterCanvas::onDrawBitmap(const SkBitmap& bm, SkScalar left, SkScalar top,
                                        const SkPaint* paint) {
     AutoPaintFilter apf(this, kBitmap_Type, paint);
     this->INHERITED::onDrawBitmap(bm, left, top, apf.paint());
 }
 
 void SkPaintFilterCanvas::onDrawBitmapRect(const SkBitmap& bm, const SkRect* src, const SkRect& dst,
-                                           const SkPaint* paint,
-                                           SK_VIRTUAL_CONSTRAINT_TYPE constraint) {
+                                           const SkPaint* paint, SrcRectConstraint constraint) {
     AutoPaintFilter apf(this, kBitmap_Type, paint);
     this->INHERITED::onDrawBitmapRect(bm, src, dst, apf.paint(), constraint);
 }
 
 void SkPaintFilterCanvas::onDrawImage(const SkImage* image, SkScalar left, SkScalar top,
                                       const SkPaint* paint) {
     AutoPaintFilter apf(this, kBitmap_Type, paint);
     this->INHERITED::onDrawImage(image, left, top, apf.paint());
 }
 
 void SkPaintFilterCanvas::onDrawImageRect(const SkImage* image, const SkRect* src,
-                                          const SkRect& dst, const SkPaint* paint
-                                          SRC_RECT_CONSTRAINT_PARAM(constraint)) {
+                                          const SkRect& dst, const SkPaint* paint,
+                                          SrcRectConstraint constraint) {
     AutoPaintFilter apf(this, kBitmap_Type, paint);
-    this->INHERITED::onDrawImageRect(image, src, dst, apf.paint()
-                                     SRC_RECT_CONSTRAINT_ARG(constraint));
+    this->INHERITED::onDrawImageRect(image, src, dst, apf.paint(), constraint);
 }
 
 void SkPaintFilterCanvas::onDrawBitmapNine(const SkBitmap& bm, const SkIRect& center,
                                            const SkRect& dst, const SkPaint* paint) {
     AutoPaintFilter apf(this, kBitmap_Type, paint);
     this->INHERITED::onDrawBitmapNine(bm, center, dst, apf.paint());
 }
 
 void SkPaintFilterCanvas::onDrawSprite(const SkBitmap& bm, int left, int top,
                                        const SkPaint* paint) {
@@ skipping 46 matching lines @@
                                            const SkMatrix* matrix, const SkPaint& paint) {
     AutoPaintFilter apf(this, kText_Type, paint);
     this->INHERITED::onDrawTextOnPath(text, byteLength, path, matrix, *apf.paint());
 }
 
 void SkPaintFilterCanvas::onDrawTextBlob(const SkTextBlob* blob, SkScalar x, SkScalar y,
                                          const SkPaint& paint) {
     AutoPaintFilter apf(this, kTextBlob_Type, paint);
     this->INHERITED::onDrawTextBlob(blob, x, y, *apf.paint());
 }