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 b12ac99de4504c5766ef0f38c26d6a5d1f32224d..6acb945fda3f2e9b389035ece676ea968429cded 100644
--- a/src/gpu/GrDrawTarget.h
+++ b/src/gpu/GrDrawTarget.h
@@ -8,6 +8,7 @@
 #ifndef GrDrawTarget_DEFINED
 #define GrDrawTarget_DEFINED
 
+#include "GrBatchFlushState.h"
 #include "GrClip.h"
 #include "GrClipMaskManager.h"
 #include "GrContext.h"
@@ -31,6 +32,7 @@
 #include "SkXfermode.h"
 
 class GrBatch;
+class GrBatchFlushState;
 class GrClip;
 class GrCaps;
 class GrPath;
@@ -230,14 +232,18 @@ private:
     // Used only by CMM.
     void clearStencilClip(const SkIRect&, bool insideClip, GrRenderTarget*);
 
+    // Prepare N batches, starting from fLastPreparedBatch
+    inline void prepareN(int N);
+
     SkSTArray<256, SkAutoTUnref<GrBatch>, true> fBatches;
     SkAutoTDelete<GrClipMaskManager>            fClipMaskManager;
     // The context is only in service of the clip mask manager, remove once CMM doesn't need this.
     GrContext*                                  fContext;
     GrGpu*                                      fGpu;
     GrResourceProvider*                         fResourceProvider;
+    GrBatchFlushState                           fFlushState;
     bool                                        fFlushing;
-    GrBatchToken                                fLastFlushToken;
+    int                                         fLastPreparedBatch;
 
     typedef SkRefCnt INHERITED;
 };