Revert of guard to remove DrawBitmapRectFlags (patchset #1 id:1 of https://codereview.chromium.org/1235393003/)

Reason for revert:
breaking android framework build

Original issue's description:
> guard to remove DrawBitmapRectFlags
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/6fb0b6779e40ce05c20cf279f0ecff31fa3cd60d

TBR=fmalita@chromium.org,djsollen@google.com,reed@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/1230823007

1 files changed, 6 insertions, 6 deletions

diff --git a/gm/bitmaprect.cpp b/gm/bitmaprect.cpp
index 7e833cb6c8..ff52c15e5d 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->drawBitmapRect(bitmap, &srcR, dstR, NULL);
+        canvas->drawBitmapRectToRect(bitmap, &srcR, dstR, NULL);
     }
 
 private:
@@ -213,16 +213,16 @@ protected:
         SkRect dstR2 = { 10, 410, 30, 430 };
 
         if (!fUseIRect) {
-            canvas->drawBitmapRect(fBigBitmap, &srcR1, dstR1, &paint);
-            canvas->drawBitmapRect(fBigBitmap, &srcR2, dstR2, &paint);
+            canvas->drawBitmapRectToRect(fBigBitmap, &srcR1, dstR1, &paint);
+            canvas->drawBitmapRectToRect(fBigBitmap, &srcR2, dstR2, &paint);
         } 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, &iSrcR1, dstR1, &paint);
+            canvas->drawBitmapRect(fBigBitmap, &iSrcR2, dstR2, &paint);
         }
     }