Revert[2] of guard to remove DrawBitmapRectFlags

bench/BitmapRectBench.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 "Benchmark.h"
 #include "SkBitmap.h"
 #include "SkCanvas.h"
@@ skipping 78 matching lines @@
 
     void onDraw(const int loops, SkCanvas* canvas) override {
         SkRandom rand;
 
         SkPaint paint;
         this->setupPaint(&paint);
         paint.setFilterQuality(fFilterQuality);
         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);
         }
     }
 
 private:
     typedef Benchmark INHERITED;
 };
 
 DEF_BENCH(return new BitmapRectBench(0xFF, kNone_SkFilterQuality, false))
 DEF_BENCH(return new BitmapRectBench(0x80, kNone_SkFilterQuality, false))
 DEF_BENCH(return new BitmapRectBench(0xFF, kLow_SkFilterQuality, false))
 DEF_BENCH(return new BitmapRectBench(0x80, kLow_SkFilterQuality, false))
 
 DEF_BENCH(return new BitmapRectBench(0xFF, kNone_SkFilterQuality, true))
 DEF_BENCH(return new BitmapRectBench(0xFF, kLow_SkFilterQuality, true))