Revert[2] of guard to remove DrawBitmapRectFlags

gm/bitmaprect.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 "gm.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
@@ skipping 55 matching lines @@
         canvas->translate(16, 40);
         for (size_t i = 0; i < SK_ARRAY_COUNT(src); i++) {
             SkRect srcR;
             srcR.set(src[i]);
 
             canvas->drawBitmap(bitmap, 0, 0, &paint);
             if (!fUseIRect) {
                 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);
             canvas->drawRect(srcR, paint);
 
             canvas->translate(160, 0);
         }
     }
 
 private:
@@ skipping 49 matching lines @@
     }
 
     void onDraw(SkCanvas* canvas) override {
 
         SkBitmap bitmap;
         make_3x3_bitmap(&bitmap);
 
         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:
     typedef skiagm::GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 static void make_big_bitmap(SkBitmap* bitmap) {
 
     static const int gXSize = 4096;
@@ skipping 49 matching lines @@
         paint.setAlpha(128);
         paint.setXfermode(mode)->unref();
 
         SkRect srcR1 = { 0.0f, 0.0f, 4096.0f, 2040.0f };
         SkRect dstR1 = { 10.1f, 10.1f, 629.9f, 400.9f };
 
         SkRect srcR2 = { 4085.0f, 10.0f, 4087.0f, 12.0f };
         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);
         }
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 class BitmapRectRounding : public skiagm::GM {
     SkBitmap fBM;
 
@@ skipping 53 matching lines @@
 static skiagm::GMRegistry reg0(MyFactory0);
 static skiagm::GMRegistry reg1(MyFactory1);
 
 static skiagm::GMRegistry reg2(MyFactory2);
 
 #ifndef SK_BUILD_FOR_ANDROID
 static skiagm::GMRegistry reg3(MyFactory3);
 static skiagm::GMRegistry reg4(MyFactory4);
 #endif