Stop closing batch prematurely

src/gpu/GrTargetCommands.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 GrTargetCommands_DEFINED
 #define GrTargetCommands_DEFINED
 
 #include "GrBatch.h"
 #include "GrBatchTarget.h"
 #include "GrDrawTarget.h"
 #include "GrGpu.h"
 #include "GrPath.h"
 #include "GrPendingProgramElement.h"
 #include "GrRenderTarget.h"
 #include "GrTRecorder.h"
 #include "SkRect.h"
 #include "SkTypes.h"
 
+// This is just to get a flag
+// TODO remove this when batch is everywhere
+#include "GrTextContext.h"
+#ifdef USE_BITMAP_TEXTBLOBS
+#define CLOSE_BATCH
+#else
+#define CLOSE_BATCH this->closeBatch();
+#endif
+
 class GrInOrderDrawBuffer;
 class GrVertexBufferAllocPool;
 class GrIndexBufferAllocPool;
 
 class GrTargetCommands : ::SkNoncopyable {
     struct SetState;
 
 public:
     GrTargetCommands(GrGpu* gpu,
                      GrVertexBufferAllocPool* vertexPool,
@@ skipping 274 matching lines @@
      // TODO hack until batch is everywhere
      GrTargetCommands::DrawBatch*        fDrawBatch;
 
      // This will go away when everything uses batch.  However, in the short term anything which
      // might be put into the GrInOrderDrawBuffer needs to make sure it closes the last batch
      void closeBatch();
 };
 
 #endif