Put clear and discard into GrBatch.

src/gpu/GrBufferedDrawTarget.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrBufferedDrawTarget.h"
 
 // We will use the reordering buffer, unless we have NVPR.
 // TODO move NVPR to batch so we can reorder
 static inline bool allow_reordering(const GrCaps* caps) {
     return caps && caps->shaderCaps() && !caps->shaderCaps()->pathRenderingSupport();
 }
 
 GrBufferedDrawTarget::GrBufferedDrawTarget(GrContext* context)
     : INHERITED(context)
     , fCommands(GrCommandBuilder::Create(context->getGpu(), allow_reordering(context->caps())))
     , fPathIndexBuffer(kPathIdxBufferMinReserve * sizeof(char)/4)
     , fPathTransformBuffer(kPathXformBufferMinReserve * sizeof(float)/4)
     , fPipelineBuffer(kPipelineBufferMinReserve)
     , fDrawID(0) {
 }
 
 GrBufferedDrawTarget::~GrBufferedDrawTarget() {
     this->reset();
 }
 
-void GrBufferedDrawTarget::onDrawBatch(GrDrawBatch* batch) {
+void GrBufferedDrawTarget::onDrawBatch(GrBatch* batch) {
     fCommands->recordDrawBatch(batch, *this->caps());
 }
 
 void GrBufferedDrawTarget::onStencilPath(const GrPipelineBuilder& pipelineBuilder,
                                          const GrPathProcessor* pathProc,
                                          const GrPath* path,
                                          const GrScissorState& scissorState,
                                          const GrStencilSettings& stencilSettings) {
     fCommands->recordStencilPath(pipelineBuilder, pathProc, path, scissorState, stencilSettings);
 }
@@ skipping 22 matching lines @@
     GrPipelineOptimizations opts;
     StateForPathDraw* state = this->createStateForPathDraw(pathProc, pipelineInfo, &opts);
     if (!state) {
         return;
     }
     fCommands->recordDrawPaths(state, this, pathProc, pathRange, indices, indexType,
                                transformValues, transformType, count, stencilSettings,
                                opts);
 }
 
-void GrBufferedDrawTarget::onClear(const SkIRect& rect, GrColor color,
-                                   GrRenderTarget* renderTarget) {
-    fCommands->recordClear(rect, color, renderTarget);
-}
-
 void GrBufferedDrawTarget::clearStencilClip(const SkIRect& rect,
                                             bool insideClip,
                                             GrRenderTarget* renderTarget) {
     fCommands->recordClearStencilClip(rect, insideClip, renderTarget);
 }
 
-void GrBufferedDrawTarget::discard(GrRenderTarget* renderTarget) {
-    if (!this->caps()->discardRenderTargetSupport()) {
-        return;
-    }
-    fCommands->recordDiscard(renderTarget);
-}
-
 void GrBufferedDrawTarget::onReset() {
     fCommands->reset();
     fPathIndexBuffer.rewind();
     fPathTransformBuffer.rewind();
 
     fPrevState.reset(NULL);
     // Note, fPrevState points into fPipelineBuffer's allocation, so we have to reset first.
     // Furthermore, we have to reset fCommands before fPipelineBuffer too.
     if (fDrawID % kPipelineBufferHighWaterMark) {
         fPipelineBuffer.rewind();
@@ skipping 31 matching lines @@
                                                       *state->fPrimitiveProcessor,
                                                       state->fBatchTracker) &&
         GrPipeline::AreEqual(*fPrevState->getPipeline(), *state->getPipeline(), false)) {
         this->unallocState(state);
     } else {
         fPrevState.reset(state);
     }
 
     return fPrevState;
 }