Revert of Preliminary attempt to remove batch tracker

src/gpu/GrBatchTarget.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 GrBatchBuffer_DEFINED
 #define GrBatchBuffer_DEFINED
 
@@ skipping 86 matching lines @@
         fIter = FlushBuffer::Iter(fFlushBuffer);
     }
     void flushNext(int n);
     void postFlush() {
         SkASSERT(!fIter.next());
         fFlushBuffer.reset();
         fAsapUploads.reset();
         fInlineUploads.reset();
     }
 
+    // TODO This goes away when everything uses batch
+    GrBatchTracker* currentBatchTracker() {
+        SkASSERT(!fFlushBuffer.empty());
+        return &fFlushBuffer.back().fBatchTracker;
+    }
+
     const GrDrawTargetCaps& caps() const { return *fGpu->caps(); }
 
     GrResourceProvider* resourceProvider() const { return fGpu->getContext()->resourceProvider(); }
 
     void* makeVertSpace(size_t vertexSize, int vertexCount,
                         const GrVertexBuffer** buffer, int* startVertex);
     uint16_t* makeIndexSpace(int indexCount,
                              const GrIndexBuffer** buffer, int* startIndex);
 
     // A helper for draws which overallocate and then return data to the pool
@@ skipping 42 matching lines @@
     FlushBuffer::Iter fIter;
     int fNumberOfDraws;
     BatchToken fCurrentToken;
     BatchToken fLastFlushedToken; // The next token to be flushed
     SkTArray<SkAutoTUnref<Uploader>, true> fAsapUploads;
     SkTArray<SkAutoTUnref<Uploader>, true> fInlineUploads;
     int fInlineUpdatesIndex;
 };
 
 #endif