Simplify GrDrawBatch uploads and token uage.

src/gpu/GrDrawingManager.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrDrawContext.h"
 #include "GrDrawingManager.h"
 #include "GrDrawTarget.h"
@@ skipping 66 matching lines @@
         fDrawTargets[i]->prepareBatches(&fFlushState);
     }
 
     // Upload all data to the GPU
     fFlushState.preIssueDraws();
 
     for (int i = 0; i < fDrawTargets.count(); ++i) {
         fDrawTargets[i]->drawBatches(&fFlushState);
     }
 
-    SkASSERT(fFlushState.lastFlushedToken() == fFlushState.currentToken());
+    SkASSERT(fFlushState.nextDrawToken() == fFlushState.nextTokenToFlush());
 
     for (int i = 0; i < fDrawTargets.count(); ++i) {
         fDrawTargets[i]->reset();
 #ifdef ENABLE_MDB
         fDrawTargets[i]->unref();
 #endif
     }
 
 #ifndef ENABLE_MDB
     // When MDB is disabled we keep reusing the same drawTarget
@@ skipping 78 matching lines @@
         GrStencilAttachment* sb = fContext->resourceProvider()->attachStencilAttachment(rt);
         if (sb) {
             return new GrPathRenderingDrawContext(fContext, this, rt, surfaceProps,
                                                   fContext->getAuditTrail(), fSingleOwner);
         }
     }
 
     return new GrDrawContext(fContext, this, rt, surfaceProps, fContext->getAuditTrail(),
                              fSingleOwner);
 }