Put clear and discard into GrBatch.

src/gpu/GrDrawTarget.h

Index: src/gpu/GrDrawTarget.h
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
index d552d39008b680d44f68b47c1ed1629611a62aa9..1890883b9aa1368860d662b65475ce7e2daf7fa9 100644
--- a/src/gpu/GrDrawTarget.h
+++ b/src/gpu/GrDrawTarget.h
@@ -30,6 +30,7 @@
 #include "SkTypes.h"
 #include "SkXfermode.h"
 
+class GrBatch;
 class GrClip;
 class GrCaps;
 class GrPath;
@@ -155,10 +156,8 @@ public:
                bool canIgnoreRect,
                GrRenderTarget* renderTarget);
 
-    /**
-     * Discards the contents render target.
-     **/
-    virtual void discard(GrRenderTarget*) = 0;
+    /** Discards the contents render target. */
+    void discard(GrRenderTarget*);
 
     /**
      * Called at start and end of gpu trace marking
@@ -242,7 +241,7 @@ private:
 
     virtual void onFlush() = 0;
 
-    virtual void onDrawBatch(GrDrawBatch*) = 0;
+    virtual void onDrawBatch(GrBatch*) = 0;
     virtual void onStencilPath(const GrPipelineBuilder&,
                                const GrPathProcessor*,
                                const GrPath*,
@@ -262,8 +261,6 @@ private:
                              const GrStencilSettings&,
                              const PipelineInfo&) = 0;
 
-    virtual void onClear(const SkIRect& rect, GrColor color, GrRenderTarget* renderTarget) = 0;
-
     /** The subclass's copy surface implementation. It should assume that any clipping has already
         been performed on the rect and point and that the GrGpu supports the copy. */
     virtual void onCopySurface(GrSurface* dst,