remove all guards for changes to drawBitmapRect / drawImageRect

src/core/SkRecorder.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBigPicture.h"
 #include "SkCanvasPriv.h"
 #include "SkPatchUtils.h"
@@ skipping 168 matching lines @@
     }
 #else
     APPEND(DrawBitmap, this->copy(paint), bitmap, left, top);
 #endif
 }
 
 void SkRecorder::onDrawBitmapRect(const SkBitmap& bitmap,
                                   const SkRect* src,
                                   const SkRect& dst,
                                   const SkPaint* paint,
-                                  SK_VIRTUAL_CONSTRAINT_TYPE legacyConstraint) {
-    SrcRectConstraint constraint = (SrcRectConstraint)legacyConstraint;
-
+                                  SrcRectConstraint constraint) {
 #ifdef WRAP_BITMAP_AS_IMAGE
     // TODO: need a way to support the flags for images...
     SkAutoTUnref<SkImage> image(SkImage::NewFromBitmap(bitmap));
     if (image) {
         this->onDrawImageRect(image, src, dst, paint);
     }
 #else
     TRY_MINIRECORDER(drawBitmapRect, bitmap, src, dst, paint, constraint);
     if (kFast_SrcRectConstraint == constraint) {
         APPEND(DrawBitmapRectFast, this->copy(paint), bitmap, this->copy(src), dst);
@@ skipping 16 matching lines @@
 #else
     APPEND(DrawBitmapNine, this->copy(paint), bitmap, center, dst);
 #endif
 }
 
 void SkRecorder::onDrawImage(const SkImage* image, SkScalar left, SkScalar top,
                              const SkPaint* paint) {
     APPEND(DrawImage, this->copy(paint), image, left, top);
 }
 
-void SkRecorder::onDrawImageRect(const SkImage* image, const SkRect* src,
-                                 const SkRect& dst,
-                                 const SkPaint* paint SRC_RECT_CONSTRAINT_PARAM(constraint)) {
-#ifdef SK_SUPPORT_LEGACY_ONDRAWIMAGERECT
-    SrcRectConstraint constraint = kStrict_SrcRectConstraint;
-#endif
+void SkRecorder::onDrawImageRect(const SkImage* image, const SkRect* src, const SkRect& dst,
+                                 const SkPaint* paint, SrcRectConstraint constraint) {
     APPEND(DrawImageRect, this->copy(paint), image, this->copy(src), dst, constraint);
 }
 
 void SkRecorder::onDrawImageNine(const SkImage* image, const SkIRect& center,
                                  const SkRect& dst, const SkPaint* paint) {
     APPEND(DrawImageNine, this->copy(paint), image, center, dst);
 }
 
 void SkRecorder::onDrawSprite(const SkBitmap& bitmap, int left, int top, const SkPaint* paint) {
     APPEND(DrawSprite, this->copy(paint), bitmap, left, top);
@@ skipping 135 matching lines @@
     INHERITED(onClipPath, path, op, edgeStyle);
     SkRecords::RegionOpAndAA opAA(op, kSoft_ClipEdgeStyle == edgeStyle);
     APPEND(ClipPath, this->devBounds(), path, opAA);
 }
 
 void SkRecorder::onClipRegion(const SkRegion& deviceRgn, SkRegion::Op op) {
     INHERITED(onClipRegion, deviceRgn, op);
     APPEND(ClipRegion, this->devBounds(), deviceRgn, op);
 }