Revert[2] of guard to remove DrawBitmapRectFlags

gm/tallstretchedbitmaps.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "gm.h"
 #include "SkCanvas.h"
 #include "SkGradientShader.h"
@@ skipping 70 matching lines @@
             SkASSERT(fTallBmps[i].fItemCnt > 10);
             SkBitmap bmp = fTallBmps[i].fBmp;
             // Draw the last 10 elements of the bitmap.
             int startItem = fTallBmps[i].fItemCnt - 10;
             int itemHeight = bmp.height() / fTallBmps[i].fItemCnt;
             SkIRect subRect = SkIRect::MakeLTRB(0, startItem * itemHeight,
                                                bmp.width(), bmp.height());
             SkRect dstRect = SkRect::MakeWH(SkIntToScalar(bmp.width()), 10.f * itemHeight);
             SkPaint paint;
             paint.setFilterQuality(kLow_SkFilterQuality);
-            canvas->drawBitmapRect(bmp, &subRect, dstRect, &paint);
+            canvas->drawBitmapRect(bmp, subRect, dstRect, &paint);
             canvas->translate(SkIntToScalar(bmp.width() + 10), 0);
         }
     }
 
 private:
     struct {
         SkBitmap fBmp;
         int      fItemCnt;
     } fTallBmps[8];
     typedef skiagm::GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 DEF_GM(return SkNEW(TallStretchedBitmapsGM);)