Revert[2] of guard to remove DrawBitmapRectFlags

samplecode/SampleBitmapRect.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 "SampleCode.h"
 #include "SkAnimTimer.h"
 #include "SkView.h"
@@ skipping 113 matching lines @@
         SkBitmap bitmap;
         make_bitmap(&bitmap);
 
         canvas->translate(20, 20);
 
         canvas->drawBitmap(bitmap, 0, 0, &paint);
         canvas->drawRect(srcR, paint);
 
         for (int i = 0; i < 2; ++i) {
             paint.setFilterQuality(1 == i ? kLow_SkFilterQuality : kNone_SkFilterQuality);
-            canvas->drawBitmapRectToRect(bitmap, &srcR, fDstR[i], &paint);
+            canvas->drawBitmapRect(bitmap, &srcR, fDstR[i], &paint,
+                                   SkCanvas::kStrict_SrcRectConstraint);
             canvas->drawRect(fDstR[i], paint);
         }
     }
 
     bool onAnimate(const SkAnimTimer& timer) override {
         if (timer.isStopped()) {
             this->resetBounce();
         } else if (timer.isRunning()) {
             this->bounce();
         }
@@ skipping 73 matching lines @@
         return this->INHERITED::onQuery(evt);
     }
 
     void onDrawContent(SkCanvas* canvas) override {
         SkPaint paint;
         paint.setStyle(SkPaint::kStroke_Style);
         paint.setColor(SK_ColorYELLOW);
 
         for (int i = 0; i < 2; ++i) {
             paint.setFilterQuality(1 == i ? kLow_SkFilterQuality : kNone_SkFilterQuality);
-            canvas->drawBitmapRectToRect(fBitmap, &fSrcR, fDstR[i], &paint);
+            canvas->drawBitmapRect(fBitmap, &fSrcR, fDstR[i], &paint,
+                                   SkCanvas::kStrict_SrcRectConstraint);
             canvas->drawRect(fDstR[i], paint);
         }
     }
 
     bool onAnimate(const SkAnimTimer& timer) override {
         if (timer.isStopped()) {
             this->resetBounce();
         } else if (timer.isRunning()) {
             this->bounceMe();
         }
         return true;
     }
 
 private:
     typedef SampleView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* F0() { return new BitmapRectView; }
 static SkView* F1() { return new BitmapRectView2; }
 static SkViewRegister gR0(F0);
 static SkViewRegister gR1(F1);