Revert of Oval and stroke AA rect now batch

src/gpu/GrOvalRenderer.h

Index: src/gpu/GrOvalRenderer.h
diff --git a/src/gpu/GrOvalRenderer.h b/src/gpu/GrOvalRenderer.h
index 96f9b3afb9faf62e47e084476aeb5d6c514cffa5..92f6ff0cdf209a8d72ec9cf7f9b443afe7ce4120 100644
--- a/src/gpu/GrOvalRenderer.h
+++ b/src/gpu/GrOvalRenderer.h
@@ -24,7 +24,7 @@
 public:
     SK_DECLARE_INST_COUNT(GrOvalRenderer)
 
-    GrOvalRenderer() : fRRectIndexBuffer(NULL), fStrokeRRectIndexBuffer(NULL) {}
+    GrOvalRenderer() : fRRectIndexBuffer(NULL) {}
     ~GrOvalRenderer() {
         this->reset();
     }
@@ -39,20 +39,19 @@
                     const SkRRect& outer, const SkRRect& inner);
 
 private:
-    bool drawEllipse(GrDrawTarget* target, const GrContext* context, bool useCoverageAA,
+    bool drawEllipse(GrDrawTarget* target, bool useCoverageAA,
                      const SkRect& ellipse,
                      const SkStrokeRec& stroke);
-    bool drawDIEllipse(GrDrawTarget* target, const GrContext* context, bool useCoverageAA,
+    bool drawDIEllipse(GrDrawTarget* target, bool useCoverageAA,
                        const SkRect& ellipse,
                        const SkStrokeRec& stroke);
-    void drawCircle(GrDrawTarget* target, const GrContext* context, bool useCoverageAA,
+    void drawCircle(GrDrawTarget* target, bool useCoverageAA,
                     const SkRect& circle,
                     const SkStrokeRec& stroke);
 
-    GrIndexBuffer* rRectIndexBuffer(bool isStrokeOnly, GrGpu* gpu);
+    GrIndexBuffer* rRectIndexBuffer(GrGpu* gpu);
 
     GrIndexBuffer* fRRectIndexBuffer;
-    GrIndexBuffer* fStrokeRRectIndexBuffer;
 
     typedef SkRefCnt INHERITED;
 };