Put clear and discard into GrBatch.

src/gpu/GrImmediateDrawTarget.cpp

Index: src/gpu/GrImmediateDrawTarget.cpp
diff --git a/src/gpu/GrImmediateDrawTarget.cpp b/src/gpu/GrImmediateDrawTarget.cpp
index bac9e6004b1141bc80ad8a73b25c32ea739803b8..55af98511f66289cb46fc194e8c87f9488a60817 100644
--- a/src/gpu/GrImmediateDrawTarget.cpp
+++ b/src/gpu/GrImmediateDrawTarget.cpp
@@ -25,7 +25,7 @@ GrImmediateDrawTarget::~GrImmediateDrawTarget() {
     this->reset();
 }
 
-void GrImmediateDrawTarget::onDrawBatch(GrDrawBatch* batch) {
+void GrImmediateDrawTarget::onDrawBatch(GrBatch* batch) {
 
 #if 0
     // TODO: encapsulate the specialization of GrVertexBatch in GrVertexBatch so that we can
@@ -40,11 +40,6 @@ void GrImmediateDrawTarget::onDrawBatch(GrDrawBatch* batch) {
 #endif
 }
 
-void GrImmediateDrawTarget::onClear(const SkIRect& rect, GrColor color,
-                                    GrRenderTarget* renderTarget) {
-    this->getGpu()->clear(rect, color, renderTarget);
-}
-
 void GrImmediateDrawTarget::onCopySurface(GrSurface* dst,
                                           GrSurface* src,
                                           const SkIRect& srcRect,
@@ -58,14 +53,6 @@ void GrImmediateDrawTarget::clearStencilClip(const SkIRect& rect,
     this->getGpu()->clearStencilClip(rect, insideClip, renderTarget);
 }
 
-void GrImmediateDrawTarget::discard(GrRenderTarget* renderTarget) {
-    if (!this->caps()->discardRenderTargetSupport()) {
-        return;
-    }
-
-    this->getGpu()->discard(renderTarget);
-}
-
 void GrImmediateDrawTarget::onReset() {}
 
 void GrImmediateDrawTarget::onFlush() {