Create separate entry points for the various flavors of drawRect

src/gpu/GrDrawTarget.h

Index: src/gpu/GrDrawTarget.h
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
index 14c7ae96f0cbe0e3b54c9e499429c541fa20225e..1f7e297e516982a528b1298c63491431197aee60 100644
--- a/src/gpu/GrDrawTarget.h
+++ b/src/gpu/GrDrawTarget.h
@@ -123,21 +123,31 @@ public:
     void drawBWRect(const GrPipelineBuilder& pipelineBuilder,

[bsalomon, 2015/08/21 15:51:44]

eek... didn't know we had this too. Don't like the inconsistency and think BW is
the less informative of our two ways of naming things.

                     GrColor color,
                     const SkMatrix& viewMatrix,
+                    const SkRect& rect);
+
+    void drawBWRect(const GrPipelineBuilder& pipelineBuilder,
+                    GrColor color,
+                    const SkMatrix& viewMatrix,
+                    const SkRect& rect,
+                    const SkMatrix& localMatrix);
+
+    void drawBWRect(const GrPipelineBuilder& pipelineBuilder,
+                    GrColor color,
+                    const SkMatrix& viewMatrix,
                     const SkRect& rect,
-                    const SkRect* localRect,
-                    const SkMatrix* localMatrix);
+                    const SkRect& localRect);
 
     /**
      * Helper for drawRect when the caller doesn't need separate local rects or matrices.
      */
     void drawSimpleRect(const GrPipelineBuilder& ds, GrColor color, const SkMatrix& viewM,
                         const SkRect& rect) {
-        this->drawBWRect(ds, color, viewM, rect, NULL, NULL);
+        this->drawBWRect(ds, color, viewM, rect);
     }
     void drawSimpleRect(const GrPipelineBuilder& ds, GrColor color, const SkMatrix& viewM,
                         const SkIRect& irect) {
         SkRect rect = SkRect::Make(irect);
-        this->drawBWRect(ds, color, viewM, rect, NULL, NULL);
+        this->drawBWRect(ds, color, viewM, rect);
     }
 
     void drawAARect(const GrPipelineBuilder& pipelineBuilder,