Revert[2] of guard to remove DrawBitmapRectFlags

gm/verylargebitmap.cpp

 /*
  * Copyright 2012 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 27 matching lines @@
     r.set(ir);
 
     canvas->save();
     canvas->clipRect(r);
     canvas->drawBitmap(bm, 0, 0, NULL);
     canvas->restore();
     canvas->drawRect(r, paint);
 
     r.offset(SkIntToScalar(150), 0);
     // exercises extract bitmap, but not shader
-    canvas->drawBitmapRect(bm, &ir, r, NULL);
+    canvas->drawBitmapRect(bm, ir, r, NULL);
     canvas->drawRect(r, paint);
 
     r.offset(SkIntToScalar(150), 0);
     // exercises bitmapshader
     canvas->drawBitmapRect(bm, NULL, r, NULL);
     canvas->drawRect(r, paint);
 }
 
 class VeryLargeBitmapGM : public skiagm::GM {
 public:
@@ skipping 41 matching lines @@
     }
 
 private:
     typedef skiagm::GM INHERITED;
 };
 
 //////////////////////////////////////////////////////////////////////////////
 
 static skiagm::GM* MyFactory(void*) { return new VeryLargeBitmapGM; }
 static skiagm::GMRegistry reg(MyFactory);