Revert[2] of guard to remove DrawBitmapRectFlags

src/effects/SkTestImageFilters.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 "SkTestImageFilters.h"
 #include "SkCanvas.h"
 #include "SkDevice.h"
@@ skipping 53 matching lines @@
     // upscale
     {
         SkBaseDevice* dev = proxy->createDevice(src.width(), src.height());
         if (NULL == dev) {
             return false;
         }
         OwnDeviceCanvas canvas(dev);
 
         SkRect r = SkRect::MakeWH(SkIntToScalar(src.width()),
                                   SkIntToScalar(src.height()));
-        canvas.drawBitmapRect(tmp, NULL, r, NULL);
+        canvas.drawBitmapRect(tmp, r);
         *result = dev->accessBitmap(false);
     }
     return true;
 }
 
 SkFlattenable* SkDownSampleImageFilter::CreateProc(SkReadBuffer& buffer) {
     SK_IMAGEFILTER_UNFLATTEN_COMMON(common, 1);
     return Create(buffer.readScalar(), common.getInput(0));
 }
 
 void SkDownSampleImageFilter::flatten(SkWriteBuffer& buffer) const {
     this->INHERITED::flatten(buffer);
     buffer.writeScalar(fScale);
 }
 
 #ifndef SK_IGNORE_TO_STRING
 void SkDownSampleImageFilter::toString(SkString* str) const {
     str->appendf("SkDownSampleImageFilter: (");
     str->append(")");
 }
 #endif