remove all guards for changes to drawBitmapRect / drawImageRect

src/utils/SkDeferredCanvas.cpp

 
 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDeferredCanvas.h"
 
@@ skipping 200 matching lines @@
     {SkASSERT(0);}
     void drawPath(const SkDraw&, const SkPath& path,
                   const SkPaint& paint,
                   const SkMatrix* prePathMatrix = NULL,
                   bool pathIsMutable = false) override
         {SkASSERT(0);}
     void drawBitmap(const SkDraw&, const SkBitmap& bitmap,
                     const SkMatrix& matrix, const SkPaint& paint) override
         {SkASSERT(0);}
     void drawBitmapRect(const SkDraw&, const SkBitmap&, const SkRect*,
-                        const SkRect&, const SkPaint&,
-                        SK_VIRTUAL_CONSTRAINT_TYPE) override
+                        const SkRect&, const SkPaint&, SkCanvas::SrcRectConstraint) override
         {SkASSERT(0);}
     void drawSprite(const SkDraw&, const SkBitmap& bitmap,
                     int x, int y, const SkPaint& paint) override
         {SkASSERT(0);}
     void drawImage(const SkDraw&, const SkImage*, SkScalar, SkScalar, const SkPaint&) override
         {SkASSERT(0);}
     void drawImageRect(const SkDraw&, const SkImage*, const SkRect*, const SkRect&,
                        const SkPaint&, SkCanvas::SrcRectConstraint) override
         {SkASSERT(0);}
     void drawImageNine(const SkDraw&, const SkImage*, const SkIRect&, const SkRect&,
@@ skipping 624 matching lines @@
         this->getDeferredDevice()->skipPendingCommands();
     }
 
     AutoImmediateDrawIfNeeded autoDraw(*this, &bitmap, paint);
     this->drawingCanvas()->drawBitmap(bitmap, left, top, paint);
     this->recordedDrawCommand();
 }
 
 void SkDeferredCanvas::onDrawBitmapRect(const SkBitmap& bitmap, const SkRect* src,
                                         const SkRect& dst, const SkPaint* paint,
-                                        SK_VIRTUAL_CONSTRAINT_TYPE constraint) {
+                                        SrcRectConstraint constraint) {
     if (fDeferredDrawing &&
         this->isFullFrame(&dst, paint) &&
         SkPaintPriv::Overwrites(bitmap, paint)) {
         this->getDeferredDevice()->skipPendingCommands();
     }
 
     AutoImmediateDrawIfNeeded autoDraw(*this, &bitmap, paint);
     this->drawingCanvas()->drawBitmapRect(bitmap, src, dst, paint, (SrcRectConstraint)constraint);
     this->recordedDrawCommand();
 }
 
 
 void SkDeferredCanvas::onDrawImage(const SkImage* image, SkScalar x, SkScalar y,
                                    const SkPaint* paint) {
     SkRect bounds = SkRect::MakeXYWH(x, y,
                                      SkIntToScalar(image->width()), SkIntToScalar(image->height()));
     if (fDeferredDrawing &&
         this->isFullFrame(&bounds, paint) &&
         SkPaintPriv::Overwrites(image, paint)) {
         this->getDeferredDevice()->skipPendingCommands();
     }
     
     AutoImmediateDrawIfNeeded autoDraw(*this, image, paint);
     this->drawingCanvas()->drawImage(image, x, y, paint);
     this->recordedDrawCommand();
 }
 void SkDeferredCanvas::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
-                                       const SkPaint* paint SRC_RECT_CONSTRAINT_PARAM(constraint)) {
+                                       const SkPaint* paint, SrcRectConstraint constraint) {
     if (fDeferredDrawing &&
         this->isFullFrame(&dst, paint) &&
         SkPaintPriv::Overwrites(image, paint)) {
         this->getDeferredDevice()->skipPendingCommands();
     }
     
     AutoImmediateDrawIfNeeded autoDraw(*this, image, paint);
-    this->drawingCanvas()->drawImageRect(image, src, dst, paint
-                                         SRC_RECT_CONSTRAINT_ARG(constraint));
+    this->drawingCanvas()->drawImageRect(image, src, dst, paint, constraint);
     this->recordedDrawCommand();
 }
 
 void SkDeferredCanvas::onDrawImageNine(const SkImage* image, const SkIRect& center,
                                        const SkRect& dst, const SkPaint* paint) {
     if (fDeferredDrawing &&
         this->isFullFrame(&dst, paint) &&
         SkPaintPriv::Overwrites(image, paint)) {
         this->getDeferredDevice()->skipPendingCommands();
     }
@@ skipping 104 matching lines @@
 SkDrawFilter* SkDeferredCanvas::setDrawFilter(SkDrawFilter* filter) {
     this->drawingCanvas()->setDrawFilter(filter);
     this->INHERITED::setDrawFilter(filter);
     this->recordedDrawCommand();
     return filter;
 }
 
 SkCanvas* SkDeferredCanvas::canvasForDrawIter() {
     return this->drawingCanvas();
 }