Revert[2] of guard to remove DrawBitmapRectFlags

samplecode/SampleTextureDomain.cpp

Index: samplecode/SampleTextureDomain.cpp
diff --git a/samplecode/SampleTextureDomain.cpp b/samplecode/SampleTextureDomain.cpp
index 2794a06956f0ac4cd5c412b518d2a64e12103022..dad1e0e07a28a521534d79df9b2607fae479e58e 100644
--- a/samplecode/SampleTextureDomain.cpp
+++ b/samplecode/SampleTextureDomain.cpp
@@ -53,7 +53,7 @@ protected:
         // 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.
@@ -64,8 +64,8 @@ protected:
 
         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());
 
@@ -98,7 +98,7 @@ protected:
         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;