Change Atlas recycling to track current flush count and recycle if Atlas not used in current flush.

src/gpu/GrAtlas.h

Index: src/gpu/GrAtlas.h
diff --git a/src/gpu/GrAtlas.h b/src/gpu/GrAtlas.h
index b6f25c210ab7fdccfa7a98a9b6ff1f22dfbc9341..722031260d5656ac074d262e837bb2d67dd77a89 100644
--- a/src/gpu/GrAtlas.h
+++ b/src/gpu/GrAtlas.h
@@ -13,6 +13,7 @@
 
 #include "GrPoint.h"
 #include "GrTexture.h"
+#include "GrDrawTarget.h"
 
 class GrGpu;
 class GrRectanizer;
@@ -36,32 +37,25 @@ public:
         }
     }
 
-    static void MarkAllUnused(GrAtlas* atlas) {
-        while (NULL != atlas) {
-            atlas->fUsed = false;
-            atlas = atlas->fNext;
-        }
-    }
-
     static bool RemoveUnusedAtlases(GrAtlasMgr* atlasMgr, GrAtlas** startAtlas);
 
-    bool used() const { return fUsed; }
-    void setUsed(bool used) { fUsed = used; }
+    GrDrawTarget::FlushToken flushToken() const { return fFlushToken; }
+    void setFlushToken(GrDrawTarget::FlushToken flush) { fFlushToken = flush; }
 
 private:
     GrAtlas(GrAtlasMgr*, int plotX, int plotY, GrMaskFormat format);
     ~GrAtlas(); // does not try to delete the fNext field
 
-    GrAtlas*        fNext;
-
     // for recycling
-    bool            fUsed;
+    GrDrawTarget::FlushToken fFlushToken;
+
+    GrAtlas*                 fNext;
 
-    GrTexture*      fTexture;
-    GrRectanizer*   fRects;
-    GrAtlasMgr*     fAtlasMgr;
-    GrIPoint16      fPlot;
-    GrMaskFormat    fMaskFormat;
+    GrTexture*               fTexture;
+    GrRectanizer*            fRects;
+    GrAtlasMgr*              fAtlasMgr;
+    GrIPoint16               fPlot;
+    GrMaskFormat             fMaskFormat;
 
     friend class GrAtlasMgr;
 };