Revert[2] of guard to remove DrawBitmapRectFlags

This reverts commit 91110195a2eee170c11885da9d16f94b00a39f87.

BUG=skia:
TBR=

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

2 files changed, 5 insertions, 4 deletions

diff --git a/bench/BitmapRectBench.cpp b/bench/BitmapRectBench.cpp
index d3a7574e04..061bfe818b 100644
--- a/bench/BitmapRectBench.cpp
+++ b/bench/BitmapRectBench.cpp
@@ -96,7 +96,8 @@ protected:
         paint.setAlpha(fAlpha);
 
         for (int i = 0; i < loops; i++) {
-            canvas->drawBitmapRectToRect(fBitmap, &fSrcR, fDstR, &paint);
+            canvas->drawBitmapRect(fBitmap, &fSrcR, fDstR, &paint,
+                                   SkCanvas::kStrict_SrcRectConstraint);
         }
     }
 
diff --git a/bench/GameBench.cpp b/bench/GameBench.cpp
index d9a397e190..3d9885f692 100644
--- a/bench/GameBench.cpp
+++ b/bench/GameBench.cpp
@@ -204,11 +204,11 @@ protected:
                                          4, verts, uvs, NULL, NULL,
                                          indices, 6, p2);
                 } else {
-                    canvas->drawBitmapRect(fAtlas, &src, dst, &p,
-                                           SkCanvas::kBleed_DrawBitmapRectFlag);
+                    canvas->drawBitmapRect(fAtlas, src, dst, &p,
+                                           SkCanvas::kFast_SrcRectConstraint);
                 }
             } else {
-                canvas->drawBitmapRect(fCheckerboard, NULL, dst, &p);
+                canvas->drawBitmapRect(fCheckerboard, dst, &p);
             }
         }
     }