Revert of Hairline batch (patchset #16 id:300001 of https://codereview.chromium.org/876673002/)

Reason for revert:
Regression

Original issue's description:
> Hairline batch
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/6eff8701f027016fbb3147412ec2292dcec2b7f5

TBR=bsalomon@google.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

Review URL: https://codereview.chromium.org/894273002

1 files changed, 2 insertions, 12 deletions

diff --git a/src/gpu/GrBatchTarget.h b/src/gpu/GrBatchTarget.h
index e2249ee7d4..b73907746f 100644
--- a/src/gpu/GrBatchTarget.h
+++ b/src/gpu/GrBatchTarget.h
@@ -17,9 +17,6 @@
  * that render their batch.
  */
 
-class GrIndexBufferAllocPool;
-class GrVertexBufferAllocPool;
-
 class GrBatchTarget : public SkNoncopyable {
 public:
     GrBatchTarget(GrGpu* gpu,
@@ -29,13 +26,11 @@ public:
         , fVertexPool(vpool)
         , fIndexPool(ipool)
         , fFlushBuffer(kFlushBufferInitialSizeInBytes)
-        , fIter(fFlushBuffer)
-        , fNumberOfDraws(0) {}
+        , fIter(fFlushBuffer) {}
 
     typedef GrDrawTarget::DrawInfo DrawInfo;
     void initDraw(const GrPrimitiveProcessor* primProc, const GrPipeline* pipeline) {
         GrNEW_APPEND_TO_RECORDER(fFlushBuffer, BufferedFlush, (primProc, pipeline));
-        fNumberOfDraws++;
     }
 
     void draw(const GrDrawTarget::DrawInfo& draw) {
@@ -44,10 +39,8 @@ public:
 
     // TODO this is temporary until batch is everywhere
     //void flush();
-    void resetNumberOfDraws() { fNumberOfDraws = 0; }
-    int numberOfDraws() const { return fNumberOfDraws; }
     void preFlush() { fIter = FlushBuffer::Iter(fFlushBuffer); }
-    void flushNext(int n);
+    void flushNext();
     void postFlush() { SkASSERT(!fIter.next()); fFlushBuffer.reset(); }
 
     // TODO This goes away when everything uses batch
@@ -56,8 +49,6 @@ public:
         return &fFlushBuffer.back().fBatchTracker;
     }
 
-    const GrDrawTargetCaps& caps() const { return *fGpu->caps(); }
-
     GrVertexBufferAllocPool* vertexPool() { return fVertexPool; }
     GrIndexBufferAllocPool* indexPool() { return fIndexPool; }
 
@@ -90,7 +81,6 @@ private:
     FlushBuffer fFlushBuffer;
     // TODO this is temporary
     FlushBuffer::Iter fIter;
-    int fNumberOfDraws;
 };
 
 #endif