Make GrVertexBatch objects hold their own draws during GrDrawTarget flush

src/gpu/GrImmediateDrawTarget.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 GrImmediateDrawTarget_DEFINED
 #define GrImmediateDrawTarget_DEFINED
 
 #include "GrDrawTarget.h"
 
-#include "GrBatchTarget.h"
+#include "GrBatchFlushState.h"
 
 /**
  * A debug GrDrawTarget which immediately flushes every command it receives
  */
 class GrImmediateDrawTarget : public GrClipTarget {
 public:
     /**
      * Creates a GrImmediateDrawTarget
      *
      * @param context    the context object that owns this draw buffer.
@@ skipping 41 matching lines @@
     void onClear(const SkIRect& rect,
                  GrColor color,
                  GrRenderTarget* renderTarget) override;
     void onCopySurface(GrSurface* dst,
                        GrSurface* src,
                        const SkIRect& srcRect,
                        const SkIPoint& dstPoint) override;
 
     bool isIssued(uint32_t drawID) override { return drawID != fDrawID; }
 
-    GrBatchTarget fBatchTarget;
     uint32_t fDrawID;
 
     typedef GrClipTarget INHERITED;
 };
 
 #endif