Revert[2] of guard to remove DrawBitmapRectFlags

samplecode/SampleTextureDomain.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 "SkBlurMask.h"
 #include "SkBlurMaskFilter.h"
@@ skipping 35 matching lines @@
     virtual void onDrawContent(SkCanvas* canvas) {
         SkRect srcRect;
         SkRect dstRect;
         SkPaint paint;
         paint.setFilterQuality(kLow_SkFilterQuality);
 
         // Test that bitmap draws from malloc-backed bitmaps respect
         // the constrained texture domain.
         srcRect.setXYWH(1, 1, 3, 3);
         dstRect.setXYWH(5, 5, 305, 305);
-        canvas->drawBitmapRectToRect(fBM, &srcRect, dstRect, &paint);
+        canvas->drawBitmapRect(fBM, &srcRect, dstRect, &paint, SkCanvas::kStrict_SrcRectConstraint);
 
         // Test that bitmap draws across separate devices also respect
         // the constrainted texture domain.
         // Note:  GPU-backed bitmaps follow a different rendering path
         // when copying from one GPU device to another.
         SkImageInfo info = SkImageInfo::MakeN32(5, 5, kOpaque_SkAlphaType);
         SkAutoTUnref<SkSurface> surface(canvas->newSurface(info));
 
         srcRect.setXYWH(1, 1, 3, 3);
         dstRect.setXYWH(1, 1, 3, 3);
-        surface->getCanvas()->drawBitmapRectToRect(fBM, &srcRect, dstRect,
-                                                   &paint);
+        surface->getCanvas()->drawBitmapRect(fBM, &srcRect, dstRect, &paint,
+                                             SkCanvas::kStrict_SrcRectConstraint);
 
         SkAutoTUnref<SkImage> image(surface->newImageSnapshot());
 
         srcRect.setXYWH(1, 1, 3, 3);
         dstRect.setXYWH(405, 5, 305, 305);
         canvas->drawImageRect(image, &srcRect, dstRect, &paint);
 
         // Test that bitmap blurring using a subrect
         // renders correctly
         srcRect.setXYWH(1, 1, 3, 3);
@@ skipping 12 matching lines @@
         // that handles blurs with rects transformed to non-
         // orthogonal rects. It also tests the NULL src rect handling
         mf = SkBlurMaskFilter::Create(kNormal_SkBlurStyle,
                                       SkBlurMask::ConvertRadiusToSigma(5),
                                       SkBlurMaskFilter::kHighQuality_BlurFlag);
         paint.setMaskFilter(mf)->unref();
 
         dstRect.setXYWH(-150, -150, 300, 300);
         canvas->translate(550, 550);
         canvas->rotate(45);
-        canvas->drawBitmapRectToRect(fBM, NULL, dstRect, &paint);
+        canvas->drawBitmapRect(fBM, dstRect, &paint);
     }
 private:
     typedef SkView INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static SkView* MyFactory() { return new TextureDomainView; }
 static SkViewRegister reg(MyFactory);