Revert[2] of guard to remove DrawBitmapRectFlags

gm/bitmaprect.cpp

Index: gm/bitmaprect.cpp
diff --git a/gm/bitmaprect.cpp b/gm/bitmaprect.cpp
index ff52c15e5d9963cf570ced85c7c0a284c2b8c0ef..8c7ba9bd5794179c53f97a8d91e225f83f9d94dd 100644
--- a/gm/bitmaprect.cpp
+++ b/gm/bitmaprect.cpp
@@ -73,7 +73,7 @@ protected:
                 canvas->drawBitmapRect(bitmap, &srcR, dstR, &paint,
                                        SkCanvas::kStrict_SrcRectConstraint);
             } else {
-                canvas->drawBitmapRect(bitmap, &src[i], dstR, &paint);
+                canvas->drawBitmapRect(bitmap, src[i], dstR, &paint);
             }
 
             canvas->drawRect(dstR, paint);
@@ -143,7 +143,7 @@ protected:
         SkRect srcR = { 0.5f, 0.5f, 2.5f, 2.5f };
         SkRect dstR = { 100, 100, 300, 200 };
 
-        canvas->drawBitmapRectToRect(bitmap, &srcR, dstR, NULL);
+        canvas->drawBitmapRect(bitmap, &srcR, dstR, NULL, SkCanvas::kStrict_SrcRectConstraint);
     }
 
 private:
@@ -213,16 +213,13 @@ protected:
         SkRect dstR2 = { 10, 410, 30, 430 };
 
         if (!fUseIRect) {
-            canvas->drawBitmapRectToRect(fBigBitmap, &srcR1, dstR1, &paint);
-            canvas->drawBitmapRectToRect(fBigBitmap, &srcR2, dstR2, &paint);
+            canvas->drawBitmapRect(fBigBitmap, &srcR1, dstR1, &paint,
+                                   SkCanvas::kStrict_SrcRectConstraint);
+            canvas->drawBitmapRect(fBigBitmap, &srcR2, dstR2, &paint,
+                                   SkCanvas::kStrict_SrcRectConstraint);
         } else {
-            SkIRect iSrcR1, iSrcR2;
-
-            srcR1.roundOut(&iSrcR1);
-            srcR2.roundOut(&iSrcR2);
-
-            canvas->drawBitmapRect(fBigBitmap, &iSrcR1, dstR1, &paint);
-            canvas->drawBitmapRect(fBigBitmap, &iSrcR2, dstR2, &paint);
+            canvas->drawBitmapRect(fBigBitmap, srcR1.roundOut(), dstR1, &paint);
+            canvas->drawBitmapRect(fBigBitmap, srcR2.roundOut(), dstR2, &paint);
         }
     }