Revert of Add choke point for modifying non-AA rect draws (e.g., applying clipping)

include/gpu/GrDrawContext.h

Index: include/gpu/GrDrawContext.h
diff --git a/include/gpu/GrDrawContext.h b/include/gpu/GrDrawContext.h
index 1a7580ea03947db7fb84de27f06545f1fe12fbb2..96f42693b48ef06ce08400cc5d5864f8dfbfbf4a 100644
--- a/include/gpu/GrDrawContext.h
+++ b/include/gpu/GrDrawContext.h
@@ -32,7 +32,6 @@
 class GrRenderTarget;
 class GrStyle;
 class GrSurface;
-struct GrUserStencilSettings;
 class SkDrawFilter;
 struct SkIPoint;
 struct SkIRect;
@@ -323,19 +322,10 @@
                           const SkRRect& origOuter,
                           const SkRRect& origInner);
 
-    bool drawFilledRect(const GrClip& clip,
-                        const GrPaint& paint,
-                        const SkMatrix& viewMatrix,
-                        const SkRect& rect,
-                        const GrUserStencilSettings* ss);
-
-    void drawNonAAFilledRect(const GrClip&,
-                             const GrPaint&,
-                             const SkMatrix& viewMatrix,
-                             const SkRect& rect,
-                             const SkRect* localRect,
-                             const SkMatrix* localMatrix,
-                             const GrUserStencilSettings* ss);
+    GrDrawBatch* getFillRectBatch(const GrPaint& paint,
+                                  const SkMatrix& viewMatrix,
+                                  const SkRect& rect,
+                                  bool* useHWAA);
 
     void internalDrawPath(const GrClip& clip,
                           const GrPaint& paint,