Revert of Incrementally flush GrDrawTarget

src/gpu/GrDrawTarget.h

Index: src/gpu/GrDrawTarget.h
diff --git a/src/gpu/GrDrawTarget.h b/src/gpu/GrDrawTarget.h
index 566a47e63ba29b61bbc5c147795589100111eff9..b12ac99de4504c5766ef0f38c26d6a5d1f32224d 100644
--- a/src/gpu/GrDrawTarget.h
+++ b/src/gpu/GrDrawTarget.h
@@ -8,7 +8,6 @@
 #ifndef GrDrawTarget_DEFINED
 #define GrDrawTarget_DEFINED
 
-#include "GrBatchFlushState.h"
 #include "GrClip.h"
 #include "GrClipMaskManager.h"
 #include "GrContext.h"
@@ -32,7 +31,6 @@
 #include "SkXfermode.h"
 
 class GrBatch;
-class GrBatchFlushState;
 class GrClip;
 class GrCaps;
 class GrPath;
@@ -238,9 +236,8 @@
     GrContext*                                  fContext;
     GrGpu*                                      fGpu;
     GrResourceProvider*                         fResourceProvider;
-    GrBatchFlushState                           fFlushState;
     bool                                        fFlushing;
-    int                                         fFirstUnpreparedBatch;
+    GrBatchToken                                fLastFlushToken;
 
     typedef SkRefCnt INHERITED;
 };