Hide GrDrawTarget from GrOvalRenderer

src/gpu/GrOvalRenderer.h

Index: src/gpu/GrOvalRenderer.h
diff --git a/src/gpu/GrOvalRenderer.h b/src/gpu/GrOvalRenderer.h
index d591ffeed38d80db1217f1d4603371f2e84c5cb2..d34398006fd013ea168845750acef9e695ad550f 100644
--- a/src/gpu/GrOvalRenderer.h
+++ b/src/gpu/GrOvalRenderer.h
@@ -10,8 +10,9 @@
 
 #include "GrPaint.h"
 
-class GrDrawTarget;
+class GrDrawBatch;
 class GrPipelineBuilder;
+class GrShaderCaps;
 struct SkRect;
 class SkStrokeRec;
 
@@ -20,52 +21,36 @@ class SkStrokeRec;
  */
 class GrOvalRenderer {
 public:
-    static bool DrawOval(GrDrawTarget*,
-                         const GrPipelineBuilder&,
-                         GrColor,
-                         const SkMatrix& viewMatrix,
-                         bool useAA,
-                         const SkRect& oval,
-                         const SkStrokeRec& stroke);
-    static bool DrawRRect(GrDrawTarget*,
-                          const GrPipelineBuilder&,
-                          GrColor,
-                          const SkMatrix& viewMatrix,
-                          bool useAA,
-                          const SkRRect& rrect,
-                          const SkStrokeRec& stroke);
-    static bool DrawDRRect(GrDrawTarget* target,
-                           const GrPipelineBuilder&,
-                           GrColor,
-                           const SkMatrix& viewMatrix,
-                           bool useAA,
-                           const SkRRect& outer,
-                           const SkRRect& inner);
+    static GrDrawBatch* CreateOvalBatch(const GrPipelineBuilder&,
+                                        GrColor,
+                                        const SkMatrix& viewMatrix,
+                                        bool useAA,
+                                        const SkRect& oval,
+                                        const SkStrokeRec& stroke,
+                                        GrShaderCaps* shaderCaps);
+    static GrDrawBatch* CreateRRectBatch(const GrPipelineBuilder&,
+                                         GrColor,
+                                         const SkMatrix& viewMatrix,
+                                         bool useAA,
+                                         const SkRRect& rrect,
+                                         const SkStrokeRec& stroke,
+                                         GrShaderCaps* shaderCaps);
 
 private:
     GrOvalRenderer();
 
-    static bool DrawEllipse(GrDrawTarget* target,
-                            const GrPipelineBuilder&,
-                            GrColor,
-                            const SkMatrix& viewMatrix,
-                            bool useCoverageAA,
-                            const SkRect& ellipse,
-                            const SkStrokeRec& stroke);
-    static bool DrawDIEllipse(GrDrawTarget* target,
-                              const GrPipelineBuilder&,
-                              GrColor,
-                              const SkMatrix& viewMatrix,
-                              bool useCoverageAA,
-                              const SkRect& ellipse,
-                              const SkStrokeRec& stroke);
-    static void DrawCircle(GrDrawTarget* target,
-                           const GrPipelineBuilder&,
-                           GrColor,
-                           const SkMatrix& viewMatrix,
-                           bool useCoverageAA,
-                           const SkRect& circle,
-                           const SkStrokeRec& stroke);
+    static GrDrawBatch* CreateEllipseBatch(GrColor,
+                                           const SkMatrix& viewMatrix,
+                                           const SkRect& ellipse,
+                                           const SkStrokeRec& stroke);
+    static GrDrawBatch* CreateDIEllipseBatch(GrColor,
+                                             const SkMatrix& viewMatrix,
+                                             const SkRect& ellipse,
+                                             const SkStrokeRec& stroke);
+    static GrDrawBatch* CreateCircleBatch(GrColor,
+                                          const SkMatrix& viewMatrix,
+                                          const SkRect& circle,
+                                          const SkStrokeRec& stroke);
 };
 
 #endif // GrOvalRenderer_DEFINED