Remove Cmd in GrTargetCommands that is no longer needed with GrCopySurfaceBatch

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
 
@@ skipping 13 matching lines @@
 
 // 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,
-            kCopySurface_CmdType       = 2,
-            kDrawPath_CmdType          = 3,
-            kDrawPaths_CmdType         = 4,
-            kDrawBatch_CmdType         = 5,
+            kDrawPath_CmdType          = 2,
+            kDrawPaths_CmdType         = 3,
+            kDrawBatch_CmdType         = 4,
         };
 
         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;
     };
 
-    struct CopySurface : public Cmd {
-        CopySurface(GrSurface* dst, GrSurface* src)
-            : Cmd(kCopySurface_CmdType)
-            , fDst(dst)
-            , fSrc(src) {
-        }
-
-        GrSurface* dst() const { return fDst.get(); }
-        GrSurface* src() const { return fSrc.get(); }
-
-        void execute(GrBatchFlushState*) override;
-
-        SkIPoint    fDstPoint;
-        SkIRect     fSrcRect;
-
-    private:
-        GrPendingIOResource<GrSurface, kWrite_GrIOType> fDst;
-        GrPendingIOResource<GrSurface, kRead_GrIOType> fSrc;
-    };
-
     struct DrawBatch : public Cmd {
         DrawBatch(GrBatch* batch)
             : Cmd(kDrawBatch_CmdType)
             , fBatch(SkRef(batch)){
             SkASSERT(!batch->isUsed());
         }
 
         GrBatch* batch() { return fBatch; }
         void execute(GrBatchFlushState*) override;
 
     private:
         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