Put clear and discard into GrBatch.

src/gpu/GrBufferedDrawTarget.h

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrBufferedDrawTarget_DEFINED
 #define GrBufferedDrawTarget_DEFINED
 
@@ skipping 16 matching lines @@
      * @param context    the context object that owns this draw buffer.
      */
     GrBufferedDrawTarget(GrContext* context);
 
     ~GrBufferedDrawTarget() override;
 
     void clearStencilClip(const SkIRect& rect,
                           bool insideClip,
                           GrRenderTarget* renderTarget) override;
 
-    void discard(GrRenderTarget*) override;
-
 protected:
     void appendIndicesAndTransforms(const void* indexValues, PathIndexType indexType, 
                                     const float* transformValues, PathTransformType transformType,
                                     int count, char** indicesLocation, float** xformsLocation) {
         int indexBytes = GrPathRange::PathIndexSizeInBytes(indexType);
         *indicesLocation = (char*) fPathIndexBuffer.alloc(count * indexBytes,
                                                           SkChunkAlloc::kThrow_AllocFailType);
         SkASSERT(SkIsAlign4((uintptr_t)*indicesLocation));
         memcpy(*indicesLocation, reinterpret_cast<const char*>(indexValues), count * indexBytes);
 
@@ skipping 22 matching lines @@
 
     void unallocState(StateForPathDraw* state) {
         state->unref();
         fPipelineBuffer.unalloc(state);
     }
 
     void onReset() override;
     void onFlush() override;
 
     // overrides from GrDrawTarget
-    void onDrawBatch(GrDrawBatch*) override;
+    void onDrawBatch(GrBatch*) override;
     void onStencilPath(const GrPipelineBuilder&,
                        const GrPathProcessor*,
                        const GrPath*,
                        const GrScissorState&,
                        const GrStencilSettings&) override;
     void onDrawPath(const GrPathProcessor*,
                     const GrPath*,
                     const GrStencilSettings&,
                     const PipelineInfo&) override;
     void onDrawPaths(const GrPathProcessor*,
                      const GrPathRange*,
                      const void* indices,
                      PathIndexType,
                      const float transformValues[],
                      PathTransformType,
                      int count,
                      const GrStencilSettings&,
                      const PipelineInfo&) override;
-    void onClear(const SkIRect& rect,
-                 GrColor color,
-                 GrRenderTarget* renderTarget) override;
     void onCopySurface(GrSurface* dst,
                        GrSurface* src,
                        const SkIRect& srcRect,
                        const SkIPoint& dstPoint) override;
 
     bool isIssued(uint32_t drawID) override { return drawID != fDrawID; }
 
     StateForPathDraw* SK_WARN_UNUSED_RESULT createStateForPathDraw(
         const GrPrimitiveProcessor*,
         const PipelineInfo&,
@@ skipping 14 matching lines @@
     SkChunkAlloc                        fPathIndexBuffer;
     SkChunkAlloc                        fPathTransformBuffer;
     SkChunkAlloc                        fPipelineBuffer;
     uint32_t                            fDrawID;
     SkAutoTUnref<StateForPathDraw>      fPrevState;
 
     typedef GrClipTarget INHERITED;
 };
 
 #endif