Refugee from Dead Machine 4: MDB Monster

src/gpu/GrBatchFlushState.h

Index: src/gpu/GrBatchFlushState.h
diff --git a/src/gpu/GrBatchFlushState.h b/src/gpu/GrBatchFlushState.h
index 2008fa69ebfc44fd014943f5292ae9a01f4f324a..dc769901317335fa8ec2435ecf9f30a667fda9dc 100644
--- a/src/gpu/GrBatchFlushState.h
+++ b/src/gpu/GrBatchFlushState.h
@@ -10,6 +10,7 @@
 
 #include "GrBufferAllocPool.h"
 #include "batches/GrVertexBatch.h"
+#include "GrContext.h"
 
 class GrResourceProvider;
 
@@ -66,7 +67,7 @@ public:
 
     /** The current token advances once for every contiguous set of uninterrupted draws prepared
         by a batch. */
-    GrBatchToken currentToken() const { return fCurrentToken; }
+    GrBatchToken currentToken2() const { return fCurrentToken; }
 
     /** The last token flushed to all the way to the backend API. */
     GrBatchToken lastFlushedToken() const { return fLastFlushedToken; }
@@ -139,7 +140,7 @@ public:
     bool hasTokenBeenFlushed(GrBatchToken token) const {
         return fState->hasTokenBeenFlushed(token);
     }
-    GrBatchToken currentToken() const { return fState->currentToken(); }
+    GrBatchToken currentToken1() const { return fState->currentToken2(); }
     GrBatchToken asapToken() const { return fState->asapToken(); }
 
     const GrCaps& caps() const { return fState->caps(); }