Revert of GrBatchPrototype

src/gpu/GrProcOptInfo.h

Index: src/gpu/GrProcOptInfo.h
diff --git a/src/gpu/GrProcOptInfo.h b/src/gpu/GrProcOptInfo.h
index 6e8f615d2c0204c5b5333707a7b000561d281096..75d88c64e2005f6caa414bd8c40356db1a74ee82 100644
--- a/src/gpu/GrProcOptInfo.h
+++ b/src/gpu/GrProcOptInfo.h
@@ -11,7 +11,6 @@
 #include "GrColor.h"
 #include "GrInvariantOutput.h"
 
-class GrBatch;
 class GrFragmentStage;
 class GrFragmentProcessor;
 class GrPrimitiveProcessor;
@@ -34,10 +33,6 @@
     void calcWithInitialValues(const GrFragmentStage*, int stageCount, GrColor startColor,
                                GrColorComponentFlags flags, bool areCoverageStages);
 
-    void calcColorWithBatch(const GrBatch*, const GrFragmentStage*, int stagecount);
-    void calcCoverageWithBatch(const GrBatch*, const GrFragmentStage*, int stagecount);
-
-    // TODO delete these when batch is everywhere
     void calcColorWithPrimProc(const GrPrimitiveProcessor*, const GrFragmentStage*, int stagecount);
     void calcCoverageWithPrimProc(const GrPrimitiveProcessor*, const GrFragmentStage*,
                                   int stagecount);