Put clear and discard into GrBatch.

src/gpu/GrTargetCommands.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrTargetCommands_DEFINED
 #define GrTargetCommands_DEFINED
 
 #include "GrDrawTarget.h"
 #include "GrPath.h"
 #include "GrPendingProgramElement.h"
 #include "GrPrimitiveProcessor.h"
 #include "GrRenderTarget.h"
 #include "GrTRecorder.h"
 
-#include "batches/GrDrawBatch.h"
+#include "batches/GrBatch.h"
+
 #include "SkRect.h"
 
 class GrResourceProvider;
 class GrBatchFlushState;
 
 // TODO: Convert all commands into GrBatch and remove this class.
 class GrTargetCommands : ::SkNoncopyable {
 public:
     GrTargetCommands() : fCmdBuffer(kCmdBufferInitialSizeInBytes), fLastFlushToken(0) {}
 
     class Cmd : ::SkNoncopyable {
     public:
         enum CmdType {
             kStencilPath_CmdType       = 1,
-            kClear_CmdType             = 2,
-            kClearStencil_CmdType      = 3,
-            kCopySurface_CmdType       = 4,
-            kDrawPath_CmdType          = 5,
-            kDrawPaths_CmdType         = 6,
-            kDrawBatch_CmdType         = 7,
+            kClearStencil_CmdType      = 2,
+            kCopySurface_CmdType       = 3,
+            kDrawPath_CmdType          = 4,
+            kDrawPaths_CmdType         = 5,
+            kDrawBatch_CmdType         = 6,
         };
 
         Cmd(CmdType type)
             : fType(type)
 #if GR_BATCH_SPEW
             , fUniqueID(GenID(&gUniqueID))
 #endif
         {}
         virtual ~Cmd() {}
 
@@ skipping 121 matching lines @@
         GrDrawTarget::PathIndexType     fIndexType;
         float*                          fTransforms;
         GrDrawTarget::PathTransformType fTransformType;
         int                             fCount;
         GrStencilSettings               fStencilSettings;
 
     private:
         GrPendingIOResource<const GrPathRange, kRead_GrIOType> fPathRange;
     };
 
-    // This is also used to record a discard by setting the color to GrColor_ILLEGAL
-    struct Clear : public Cmd {
-        Clear(GrRenderTarget* rt) : Cmd(kClear_CmdType), fRenderTarget(rt) {}
-
-        GrRenderTarget* renderTarget() const { return fRenderTarget.get(); }
-
-        void execute(GrBatchFlushState*) override;
-
-        SkIRect fRect;
-        GrColor fColor;
-
-    private:
-        GrPendingIOResource<GrRenderTarget, kWrite_GrIOType> fRenderTarget;
-    };
-
     // This command is ONLY used by the clip mask manager to clear the stencil clip bits
     struct ClearStencilClip : public Cmd {
         ClearStencilClip(GrRenderTarget* rt) : Cmd(kClearStencil_CmdType), fRenderTarget(rt) {}
 
         GrRenderTarget* renderTarget() const { return fRenderTarget.get(); }
 
         void execute(GrBatchFlushState*) override;
 
         SkIRect fRect;
         bool    fInsideClip;
@@ skipping 16 matching lines @@
 
         SkIPoint    fDstPoint;
         SkIRect     fSrcRect;
 
     private:
         GrPendingIOResource<GrSurface, kWrite_GrIOType> fDst;
         GrPendingIOResource<GrSurface, kRead_GrIOType> fSrc;
     };
 
     struct DrawBatch : public Cmd {
-        DrawBatch(GrDrawBatch* batch)
+        DrawBatch(GrBatch* batch)
             : Cmd(kDrawBatch_CmdType)
             , fBatch(SkRef(batch)){
             SkASSERT(!batch->isUsed());
         }
 
-        GrDrawBatch* batch() { return fBatch; }
+        GrBatch* batch() { return fBatch; }
         void execute(GrBatchFlushState*) override;
 
     private:
-        SkAutoTUnref<GrDrawBatch>   fBatch;
+        SkAutoTUnref<GrBatch>   fBatch;
     };
 
     static const int kCmdBufferInitialSizeInBytes = 8 * 1024;
 
     typedef void* TCmdAlign; // This wouldn't be enough align if a command used long double.
     typedef GrTRecorder<Cmd, TCmdAlign> CmdBuffer;
 
     CmdBuffer* cmdBuffer() { return &fCmdBuffer; }
 
     CmdBuffer                           fCmdBuffer;
     GrBatchToken                        fLastFlushToken;
 };
 
 #endif